Make test-heap/TestInternalWeakLists pass with the i18n extension loaded

test/cctest/test-heap.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1324 matching lines @@
 
     // Create a handle scope so no function objects get stuch in the outer
     // handle scope
     HandleScope scope(isolate);
     const char* source = "function f1() { };"
                          "function f2() { };"
                          "function f3() { };"
                          "function f4() { };"
                          "function f5() { };";
     CompileRun(source);
-    CHECK_EQ(0, CountOptimizedUserFunctions(ctx[i]));
+    int optimized_user_functions_base = CountOptimizedUserFunctions(ctx[i]);

[Michael Starzinger, 2013/07/05 12:28:46]

Can we move up getting the base number of optimized functions one line (to
before CompileRun)?

     CompileRun("f1()");
-    CHECK_EQ(opt ? 1 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 1 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
     CompileRun("f2()");
-    CHECK_EQ(opt ? 2 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 2 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
     CompileRun("f3()");
-    CHECK_EQ(opt ? 3 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 3 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
     CompileRun("f4()");
-    CHECK_EQ(opt ? 4 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 4 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
     CompileRun("f5()");
-    CHECK_EQ(opt ? 5 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 5 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
 
     // Remove function f1, and
     CompileRun("f1=null");
 
     // Scavenge treats these references as strong.
     for (int j = 0; j < 10; j++) {
       HEAP->PerformScavenge();
-      CHECK_EQ(opt ? 5 : 0, CountOptimizedUserFunctions(ctx[i]));
+      CHECK_EQ(opt ? optimized_user_functions_base + 5 : 0,
+               CountOptimizedUserFunctions(ctx[i]));
     }
 
     // Mark compact handles the weak references.
     isolate->compilation_cache()->Clear();
     heap->CollectAllGarbage(Heap::kNoGCFlags);
-    CHECK_EQ(opt ? 4 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 4 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
 
     // Get rid of f3 and f5 in the same way.
     CompileRun("f3=null");
     for (int j = 0; j < 10; j++) {
       HEAP->PerformScavenge();
-      CHECK_EQ(opt ? 4 : 0, CountOptimizedUserFunctions(ctx[i]));
+      CHECK_EQ(opt ? optimized_user_functions_base + 4 : 0,
+               CountOptimizedUserFunctions(ctx[i]));
     }
     HEAP->CollectAllGarbage(Heap::kNoGCFlags);
-    CHECK_EQ(opt ? 3 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 3 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
     CompileRun("f5=null");
     for (int j = 0; j < 10; j++) {
       HEAP->PerformScavenge();
-      CHECK_EQ(opt ? 3 : 0, CountOptimizedUserFunctions(ctx[i]));
+      CHECK_EQ(opt ? optimized_user_functions_base + 3 : 0,
+               CountOptimizedUserFunctions(ctx[i]));
     }
     HEAP->CollectAllGarbage(Heap::kNoGCFlags);
-    CHECK_EQ(opt ? 2 : 0, CountOptimizedUserFunctions(ctx[i]));
+    CHECK_EQ(opt ? optimized_user_functions_base + 2 : 0,
+             CountOptimizedUserFunctions(ctx[i]));
 
     ctx[i]->Exit();
   }
 
   // Force compilation cache cleanup.
   HEAP->CollectAllGarbage(Heap::kNoGCFlags);
 
   // Dispose the native contexts one by one.
   for (int i = 0; i < kNumTestContexts; i++) {
     // TODO(dcarney): is there a better way to do this?
@@ skipping 1917 matching lines @@
              "    var a = new Array(n);"
              "    for (var i = 0; i < n; i += 100) a[i] = i;"
              "};"
              "f(10 * 1024 * 1024);");
   IncrementalMarking* marking = HEAP->incremental_marking();
   if (marking->IsStopped()) marking->Start();
   // This big step should be sufficient to mark the whole array.
   marking->Step(100 * MB, IncrementalMarking::NO_GC_VIA_STACK_GUARD);
   ASSERT(marking->IsComplete());
 }