Revert of Only use FreeSpace objects in the free list.

test/cctest/test-serialize.cc

 // Copyright 2007-2010 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 138 matching lines @@
     v8::HandleScope scope(isolate);
     v8::Context::New(isolate);
   }
 
   Isolate* internal_isolate = reinterpret_cast<Isolate*>(isolate);
   internal_isolate->heap()->CollectAllAvailableGarbage("serialize");
   WriteToFile(internal_isolate, FLAG_testing_serialization_file);
 }
 
 
-Vector<const uint8_t> ConstructSource(Vector<const uint8_t> head,
-                                      Vector<const uint8_t> body,
-                                      Vector<const uint8_t> tail, int repeats) {
-  int source_length = head.length() + body.length() * repeats + tail.length();
-  uint8_t* source = NewArray<uint8_t>(static_cast<size_t>(source_length));
-  CopyChars(source, head.start(), head.length());
-  for (int i = 0; i < repeats; i++) {
-    CopyChars(source + head.length() + i * body.length(), body.start(),
-              body.length());
-  }
-  CopyChars(source + head.length() + repeats * body.length(), tail.start(),
-            tail.length());
-  return Vector<const uint8_t>(const_cast<const uint8_t*>(source),
-                               source_length);
-}
-
-
 // Test that the whole heap can be serialized.
 UNINITIALIZED_TEST(Serialize) {
   if (!Snapshot::HaveASnapshotToStartFrom()) {
     v8::Isolate::CreateParams params;
     params.enable_serializer = true;
     v8::Isolate* isolate = v8::Isolate::New(params);
     Serialize(isolate);
   }
 }
 
@@ skipping 124 matching lines @@
       const char* c_source = "\"1234\".length";
       v8::Local<v8::String> source = v8::String::NewFromUtf8(isolate, c_source);
       v8::Local<v8::Script> script = v8::Script::Compile(source);
       CHECK_EQ(4, script->Run()->Int32Value());
     }
     isolate->Dispose();
   }
 }
 
 
-// Test that the whole heap can be serialized.
-UNINITIALIZED_TEST(SerializeMultiplePages) {
-  if (!Snapshot::HaveASnapshotToStartFrom()) {
-    v8::Isolate::CreateParams params;
-    params.enable_serializer = true;
-    v8::Isolate* isolate = v8::Isolate::New(params);
-    {
-      v8::Isolate::Scope isolate_scope(isolate);
-      v8::HandleScope handle_scope(isolate);
-      v8::Local<v8::Context> context = v8::Context::New(isolate);
-      v8::Context::Scope context_scope(context);
-      Vector<const uint8_t> source = ConstructSource(
-          STATIC_CHAR_VECTOR("var s='"), STATIC_CHAR_VECTOR("A"),
-          STATIC_CHAR_VECTOR("';"), Page::kMaxRegularHeapObjectSize - 100);
-      v8::Handle<v8::String> source_str = v8::String::NewFromOneByte(
-          isolate, source.start(), v8::String::kNormalString, source.length());
-      CompileRun(source_str);
-    }
-
-    Isolate* internal_isolate = reinterpret_cast<Isolate*>(isolate);
-    internal_isolate->heap()->CollectAllAvailableGarbage("serialize");
-    WriteToFile(internal_isolate, FLAG_testing_serialization_file);
-  }
-}
-
-
 UNINITIALIZED_TEST(PartialSerialization) {
   if (!Snapshot::HaveASnapshotToStartFrom()) {
     v8::Isolate::CreateParams params;
     params.enable_serializer = true;
     v8::Isolate* v8_isolate = v8::Isolate::New(params);
     Isolate* isolate = reinterpret_cast<Isolate*>(v8_isolate);
     v8_isolate->Enter();
     {
       Heap* heap = isolate->heap();
 
@@ skipping 226 matching lines @@
   }
 }
 
 
 UNINITIALIZED_TEST(CustomContextSerialization) {
   if (!Snapshot::HaveASnapshotToStartFrom()) {
     v8::Isolate::CreateParams params;
     params.enable_serializer = true;
     v8::Isolate* v8_isolate = v8::Isolate::New(params);
     Isolate* isolate = reinterpret_cast<Isolate*>(v8_isolate);
+    Heap* heap = isolate->heap();
     {
       v8::Isolate::Scope isolate_scope(v8_isolate);
 
       v8::Persistent<v8::Context> env;
       {
         HandleScope scope(isolate);
         env.Reset(v8_isolate, v8::Context::New(v8_isolate));
       }
       DCHECK(!env.IsEmpty());
       {
         v8::HandleScope handle_scope(v8_isolate);
         v8::Local<v8::Context>::New(v8_isolate, env)->Enter();
         // After execution, e's function context refers to the global object.
         CompileRun(
             "var e;"
             "(function() {"
             "  e = function(s) { return eval (s); }"
             "})();"
             "var o = this;"
             "var r = Math.random() + Math.cos(0);"
             "var f = (function(a, b) { return a + b; }).bind(1, 2, 3);"
             "var s = parseInt('12345');");
-
-        Vector<const uint8_t> source = ConstructSource(
-            STATIC_CHAR_VECTOR("function g() { return [,"),
-            STATIC_CHAR_VECTOR("1,"),
-            STATIC_CHAR_VECTOR("];} a = g(); b = g(); b.push(1);"), 100000);
-        v8::Handle<v8::String> source_str = v8::String::NewFromOneByte(
-            v8_isolate, source.start(), v8::String::kNormalString,
-            source.length());
-        CompileRun(source_str);
-        source.Dispose();
       }
       // Make sure all builtin scripts are cached.
       {
         HandleScope scope(isolate);
         for (int i = 0; i < Natives::GetBuiltinsCount(); i++) {
           isolate->bootstrapper()->NativesSourceLookup(i);
         }
       }
       // If we don't do this then we end up with a stray root pointing at the
       // context even after we have disposed of env.
-      isolate->heap()->CollectAllAvailableGarbage("snapshotting");
+      heap->CollectAllGarbage(Heap::kNoGCFlags);
 
       int file_name_length = StrLength(FLAG_testing_serialization_file) + 10;
       Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
       SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file);
 
       {
         v8::HandleScope handle_scope(v8_isolate);
         v8::Local<v8::Context>::New(v8_isolate, env)->Exit();
       }
 
@@ skipping 67 matching lines @@
         v8::Handle<v8::Context> v8_context = v8::Utils::ToLocal(context);
         v8::Context::Scope context_scope(v8_context);
         double r = CompileRun("r")->ToNumber(v8_isolate)->Value();
         CHECK(r >= 1 && r <= 2);
         int f = CompileRun("f()")->ToNumber(v8_isolate)->Int32Value();
         CHECK_EQ(5, f);
         f = CompileRun("e('f()')")->ToNumber(v8_isolate)->Int32Value();
         CHECK_EQ(5, f);
         v8::Handle<v8::String> s = CompileRun("s")->ToString(v8_isolate);
         CHECK(s->Equals(v8_str("12345")));
-        int a = CompileRun("a.length")->ToNumber(v8_isolate)->Int32Value();
-        CHECK_EQ(100001, a);
-        int b = CompileRun("b.length")->ToNumber(v8_isolate)->Int32Value();
-        CHECK_EQ(100002, b);
       }
     }
     v8_isolate->Dispose();
   }
 }
 
 
 TEST(TestThatAlwaysSucceeds) {
 }
 
@@ skipping 132 matching lines @@
   Handle<String> expected =
       isolate->factory()->NewStringFromAsciiChecked("string1");
 
   CHECK(Handle<String>::cast(copy_result)->Equals(*expected));
   CHECK_EQ(builtins_count, CountBuiltins());
 
   delete cache;
 }
 
 
+Vector<const uint8_t> ConstructSource(Vector<const uint8_t> head,
+                                      Vector<const uint8_t> body,
+                                      Vector<const uint8_t> tail, int repeats) {
+  int source_length = head.length() + body.length() * repeats + tail.length();
+  uint8_t* source = NewArray<uint8_t>(static_cast<size_t>(source_length));
+  CopyChars(source, head.start(), head.length());
+  for (int i = 0; i < repeats; i++) {
+    CopyChars(source + head.length() + i * body.length(), body.start(),
+              body.length());
+  }
+  CopyChars(source + head.length() + repeats * body.length(), tail.start(),
+            tail.length());
+  return Vector<const uint8_t>(const_cast<const uint8_t*>(source),
+                               source_length);
+}
+
+
 TEST(SerializeToplevelLargeCodeObject) {
   FLAG_serialize_toplevel = true;
   LocalContext context;
   Isolate* isolate = CcTest::i_isolate();
   isolate->compilation_cache()->Disable();  // Disable same-isolate code cache.
 
   v8::HandleScope scope(CcTest::isolate());
 
   Vector<const uint8_t> source =
       ConstructSource(STATIC_CHAR_VECTOR("var j=1; try { if (j) throw 1;"),
@@ skipping 511 matching lines @@
     {
       DisallowCompilation no_compile(reinterpret_cast<Isolate*>(isolate2));
       script = v8::ScriptCompiler::CompileUnbound(
           isolate2, &source, v8::ScriptCompiler::kConsumeCodeCache);
     }
     v8::Local<v8::Value> result = script->BindToCurrentContext()->Run();
     CHECK(result->ToString(isolate2)->Equals(v8_str("XY")));
   }
   isolate2->Dispose();
 }