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

Side by Side Diff: src/type-info.cc

Issue 10832365: Rename Context::global to Context::global_object, (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Addressed Michael's comments. Created 8 years, 4 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 | « src/runtime.cc ('k') | src/x64/builtins-x64.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 } 550 }
551 constructor = map->constructor(); 551 constructor = map->constructor();
552 if (constructor->IsNull()) return false; 552 if (constructor->IsNull()) return false;
553 JSFunction* function = JSFunction::cast(constructor); 553 JSFunction* function = JSFunction::cast(constructor);
554 return CanRetainOtherContext(function, native_context); 554 return CanRetainOtherContext(function, native_context);
555 } 555 }
556 556
557 557
558 bool TypeFeedbackOracle::CanRetainOtherContext(JSFunction* function, 558 bool TypeFeedbackOracle::CanRetainOtherContext(JSFunction* function,
559 Context* native_context) { 559 Context* native_context) {
560 return function->context()->global() != native_context->global() 560 return function->context()->global_object() != native_context->global_object()
561 && function->context()->global() != native_context->builtins(); 561 && function->context()->global_object() != native_context->builtins();
562 } 562 }
563 563
564 564
565 static void AddMapIfMissing(Handle<Map> map, SmallMapList* list, 565 static void AddMapIfMissing(Handle<Map> map, SmallMapList* list,
566 Zone* zone) { 566 Zone* zone) {
567 for (int i = 0; i < list->length(); ++i) { 567 for (int i = 0; i < list->length(); ++i) {
568 if (list->at(i).is_identical_to(map)) return; 568 if (list->at(i).is_identical_to(map)) return;
569 } 569 }
570 list->Add(map, zone); 570 list->Add(map, zone);
571 } 571 }
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 USE(maybe_result); 728 USE(maybe_result);
729 #ifdef DEBUG 729 #ifdef DEBUG
730 Object* result = NULL; 730 Object* result = NULL;
731 // Dictionary has been allocated with sufficient size for all elements. 731 // Dictionary has been allocated with sufficient size for all elements.
732 ASSERT(maybe_result->ToObject(&result)); 732 ASSERT(maybe_result->ToObject(&result));
733 ASSERT(*dictionary_ == result); 733 ASSERT(*dictionary_ == result);
734 #endif 734 #endif
735 } 735 }
736 736
737 } } // namespace v8::internal 737 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/runtime.cc ('k') | src/x64/builtins-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698