Reviewers: Mads Ager,

Description:
Fix presubmit and check failures introduced by r5284.

Please review this at http://codereview.chromium.org/3141021/show

Affected files:
  M src/mark-compact.cc
  M test/cctest/test-heap.cc


Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index 26dfbb8a657e6d0ce86e5a06ed8a3ba1cb85e593..c5eabebbcbeece0443415793f85e8798d8404e5b 100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -518,15 +518,15 @@ class StaticMarkingVisitor : public StaticVisitorBase {
     if (!ctx->IsHeapObject()) return false;

     Map* map = SafeMap(ctx);
-    if(!(map == Heap::raw_unchecked_context_map() ||
-         map == Heap::raw_unchecked_catch_context_map() ||
-         map == Heap::raw_unchecked_global_context_map())) {
+    if (!(map == Heap::raw_unchecked_context_map() ||
+          map == Heap::raw_unchecked_catch_context_map() ||
+          map == Heap::raw_unchecked_global_context_map())) {
       return false;
     }

     Context* context = reinterpret_cast<Context*>(ctx);

-    if(IsJSBuiltinsObject(context->global())) {
+    if (IsJSBuiltinsObject(context->global())) {
       return false;
     }

Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index 5b46285b09d8b533a6132d6424f12edba176ad73..9d5e1f19f9b467a4ec4d248fb3fea41e2462f8f6 100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -980,6 +980,7 @@ TEST(TestCodeFlushing) {
   Heap::CollectAllGarbage(true);
   Heap::CollectAllGarbage(true);
   Heap::CollectAllGarbage(true);
+  Heap::CollectAllGarbage(true);

   // foo should no longer be in the compilation cache
   CHECK(!function->shared()->is_compiled());


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to