Fix spurious bugs in GrowAndShrinkNewSpace when the

test/cctest/test-heap.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 
 #include <stdlib.h>
 
 #include "v8.h"
 
 #include "execution.h"
 #include "factory.h"
 #include "macro-assembler.h"
 #include "global-handles.h"
@@ skipping 1257 matching lines @@
   for (intptr_t i = 0; i < number_of_fillers; i++) {
     CHECK(HEAP->InNewSpace(*FACTORY->NewFixedArray(32, NOT_TENURED)));
   }
 }
 
 
 TEST(GrowAndShrinkNewSpace) {
   InitializeVM();
   NewSpace* new_space = HEAP->new_space();
 
+  if (HEAP->ReservedSemiSpaceSize() == HEAP->InitialSemiSpaceSize()) {

[Michael Starzinger, 2012/04/26 14:41:45]

Shouldn't the test say something like "InitialSemiSpaceSize ==
MaxSemiSpaceSize"? Because the current condition looks more like a tautology.

+    // We can't test new space growing and shrinking if the max size
+    // is the same as the minimum (initial) size.
+    return;
+  }
+
   // Explicitly growing should double the space capacity.
   intptr_t old_capacity, new_capacity;
   old_capacity = new_space->Capacity();
   new_space->Grow();
   new_capacity = new_space->Capacity();
   CHECK(2 * old_capacity == new_capacity);
 
   old_capacity = new_space->Capacity();
   FillUpNewSpace(new_space);
   new_capacity = new_space->Capacity();
@@ skipping 20 matching lines @@
   new_space->Shrink();
   new_space->Shrink();
   new_space->Shrink();
   new_capacity = new_space->Capacity();
   CHECK(old_capacity == new_capacity);
 }
 
 
 TEST(CollectingAllAvailableGarbageShrinksNewSpace) {
   InitializeVM();
+
+  if (HEAP->ReservedSemiSpaceSize() == HEAP->InitialSemiSpaceSize()) {
+    // We can't test new space growing and shrinking if the max size
+    // is the same as the minimum (initial) size.
+    return;
+  }
+
   v8::HandleScope scope;
   NewSpace* new_space = HEAP->new_space();
   intptr_t old_capacity, new_capacity;
   old_capacity = new_space->Capacity();
   new_space->Grow();
   new_capacity = new_space->Capacity();
   CHECK(2 * old_capacity == new_capacity);
   FillUpNewSpace(new_space);
   HEAP->CollectAllAvailableGarbage();
   new_capacity = new_space->Capacity();
@@ skipping 374 matching lines @@
       "f(1); f(2); f(3);"
       "%OptimizeFunctionOnNextCall(f);"
       "f(4);");
   CHECK_EQ(4, res->ToObject()->GetRealNamedProperty(v8_str("x"))->Int32Value());
 
   Handle<JSObject> o =
       v8::Utils::OpenHandle(*v8::Handle<v8::Object>::Cast(res));
 
   CHECK(HEAP->InNewSpace(*o));
 }