Version 4.8.2.1 (cherry-pick)

test/cctest/test-api.cc

Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index a255183af051f0e9a5068920d97dc10f884e870d..93cdce62075fd689a1496499f95dd900d183f73a 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -6536,8 +6536,7 @@ static void IndependentWeakHandle(bool global_gc, bool interlinked) {
     Local<Object> b(v8::Object::New(iso));
     object_a.handle.Reset(iso, a);
     object_b.handle.Reset(iso, b);
-    if (interlinked &&
-        !v8::internal::FLAG_scavenge_reclaim_unmodified_objects) {
+    if (interlinked) {
       a->Set(v8_str("x"), b);
       b->Set(v8_str("x"), a);
     }
@@ -6548,9 +6547,8 @@ static void IndependentWeakHandle(bool global_gc, bool interlinked) {
     }
     // We are relying on this creating a big flag array and reserving the space
     // up front.
-    v8::Handle<Value> big_array = CompileRun("new Array(5000)");
-    if (!v8::internal::FLAG_scavenge_reclaim_unmodified_objects)
-      a->Set(v8_str("y"), big_array);
+    v8::Handle<Value> big_array = CompileRun("new Array(50000)");
+    a->Set(v8_str("y"), big_array);
     big_heap_size = CcTest::heap()->SizeOfObjects();
   }
 
@@ -6571,7 +6569,7 @@ static void IndependentWeakHandle(bool global_gc, bool interlinked) {
   }
   // A single GC should be enough to reclaim the memory, since we are using
   // phantom handles.
-  CHECK_LT(CcTest::heap()->SizeOfObjects(), big_heap_size - 20000);
+  CHECK_LT(CcTest::heap()->SizeOfObjects(), big_heap_size - 200000);
   CHECK(object_a.flag);
   CHECK(object_b.flag);
 }