Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Side by Side Diff: src/builtins.cc

Issue 7065023: Merge r8032 to the 3.1 branch (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.1/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 if (array_proto->elements() != Heap::empty_fixed_array()) return false; 366 if (array_proto->elements() != Heap::empty_fixed_array()) return false;
367 // Hidden prototype 367 // Hidden prototype
368 array_proto = JSObject::cast(array_proto->GetPrototype()); 368 array_proto = JSObject::cast(array_proto->GetPrototype());
369 ASSERT(array_proto->elements() == Heap::empty_fixed_array()); 369 ASSERT(array_proto->elements() == Heap::empty_fixed_array());
370 // Object.prototype 370 // Object.prototype
371 Object* proto = array_proto->GetPrototype(); 371 Object* proto = array_proto->GetPrototype();
372 if (proto == Heap::null_value()) return false; 372 if (proto == Heap::null_value()) return false;
373 array_proto = JSObject::cast(proto); 373 array_proto = JSObject::cast(proto);
374 if (array_proto != global_context->initial_object_prototype()) return false; 374 if (array_proto != global_context->initial_object_prototype()) return false;
375 if (array_proto->elements() != Heap::empty_fixed_array()) return false; 375 if (array_proto->elements() != Heap::empty_fixed_array()) return false;
376 ASSERT(array_proto->GetPrototype()->IsNull()); 376 return array_proto->GetPrototype()->IsNull();
377 return true;
378 } 377 }
379 378
380 379
381 MUST_USE_RESULT 380 MUST_USE_RESULT
382 static inline MaybeObject* EnsureJSArrayWithWritableFastElements( 381 static inline MaybeObject* EnsureJSArrayWithWritableFastElements(
383 Object* receiver) { 382 Object* receiver) {
384 if (!receiver->IsJSArray()) return NULL; 383 if (!receiver->IsJSArray()) return NULL;
385 JSArray* array = JSArray::cast(receiver); 384 JSArray* array = JSArray::cast(receiver);
386 HeapObject* elms = array->elements(); 385 HeapObject* elms = array->elements();
387 if (elms->map() == Heap::fixed_array_map()) return elms; 386 if (elms->map() == Heap::fixed_array_map()) return elms;
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 if (entry->contains(pc)) { 1576 if (entry->contains(pc)) {
1578 return names_[i]; 1577 return names_[i];
1579 } 1578 }
1580 } 1579 }
1581 } 1580 }
1582 return NULL; 1581 return NULL;
1583 } 1582 }
1584 1583
1585 1584
1586 } } // namespace v8::internal 1585 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698