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

Side by Side Diff: src/mark-compact.cc

Issue 3141021: Fix presubmit and check failures introduced by r5284. (Closed)
Patch Set: Created 10 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
« no previous file with comments | « no previous file | test/cctest/test-heap.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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 static inline bool IsJSBuiltinsObject(Object* obj) { 511 static inline bool IsJSBuiltinsObject(Object* obj) {
512 return obj->IsHeapObject() && 512 return obj->IsHeapObject() &&
513 (SafeMap(obj)->instance_type() == JS_BUILTINS_OBJECT_TYPE); 513 (SafeMap(obj)->instance_type() == JS_BUILTINS_OBJECT_TYPE);
514 } 514 }
515 515
516 516
517 static inline bool IsValidNotBuiltinContext(Object* ctx) { 517 static inline bool IsValidNotBuiltinContext(Object* ctx) {
518 if (!ctx->IsHeapObject()) return false; 518 if (!ctx->IsHeapObject()) return false;
519 519
520 Map* map = SafeMap(ctx); 520 Map* map = SafeMap(ctx);
521 if(!(map == Heap::raw_unchecked_context_map() || 521 if (!(map == Heap::raw_unchecked_context_map() ||
522 map == Heap::raw_unchecked_catch_context_map() || 522 map == Heap::raw_unchecked_catch_context_map() ||
523 map == Heap::raw_unchecked_global_context_map())) { 523 map == Heap::raw_unchecked_global_context_map())) {
524 return false; 524 return false;
525 } 525 }
526 526
527 Context* context = reinterpret_cast<Context*>(ctx); 527 Context* context = reinterpret_cast<Context*>(ctx);
528 528
529 if(IsJSBuiltinsObject(context->global())) { 529 if (IsJSBuiltinsObject(context->global())) {
530 return false; 530 return false;
531 } 531 }
532 532
533 return true; 533 return true;
534 } 534 }
535 535
536 536
537 static void VisitJSFunction(Map* map, HeapObject* object) { 537 static void VisitJSFunction(Map* map, HeapObject* object) {
538 JSFunction* jsfunction = reinterpret_cast<JSFunction*>(object); 538 JSFunction* jsfunction = reinterpret_cast<JSFunction*>(object);
539 539
(...skipping 2099 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 } 2639 }
2640 2640
2641 2641
2642 void MarkCompactCollector::Initialize() { 2642 void MarkCompactCollector::Initialize() {
2643 StaticPointersToNewGenUpdatingVisitor::Initialize(); 2643 StaticPointersToNewGenUpdatingVisitor::Initialize();
2644 StaticMarkingVisitor::Initialize(); 2644 StaticMarkingVisitor::Initialize();
2645 } 2645 }
2646 2646
2647 2647
2648 } } // namespace v8::internal 2648 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | test/cctest/test-heap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698