Reland "Merge old data and pointer space."

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 1056 matching lines @@
       isolate->factory()->NewFunctionFromSharedFunctionInfo(
           copy, isolate->native_context());
 
   USE(Execution::Call(isolate, copy_fun, global, 0, NULL));
 
   CHECK_EQ(600000 + 700000, CompileRun("(a + b).length")->Int32Value());
   CHECK_EQ(500000 + 600000, CompileRun("(b + c).length")->Int32Value());
   Heap* heap = isolate->heap();
   CHECK(heap->InSpace(
       *v8::Utils::OpenHandle(*CompileRun("a")->ToString(CcTest::isolate())),
-      OLD_DATA_SPACE));
+      OLD_SPACE));
   CHECK(heap->InSpace(
       *v8::Utils::OpenHandle(*CompileRun("b")->ToString(CcTest::isolate())),
-      OLD_DATA_SPACE));
+      OLD_SPACE));
   CHECK(heap->InSpace(
       *v8::Utils::OpenHandle(*CompileRun("c")->ToString(CcTest::isolate())),
-      OLD_DATA_SPACE));
+      OLD_SPACE));
 
   delete cache;
   source_a.Dispose();
   source_b.Dispose();
   source_c.Dispose();
 }
 
 
 class SerializerOneByteResource
     : public v8::String::ExternalOneByteStringResource {
@@ skipping 448 matching lines @@
     CHECK_EQ(11, CompileRun("foo(0)")->ToInt32(isolate)->Int32Value());
     CHECK_EQ(11, CompileRun("foo(1)")->ToInt32(isolate)->Int32Value());
     CHECK_EQ(12, CompileRun("foo(2)")->ToInt32(isolate)->Int32Value());
     CHECK_EQ(12, CompileRun("foo(3)")->ToInt32(isolate)->Int32Value());
     CHECK_EQ(23, CompileRun("foo(4)")->ToInt32(isolate)->Int32Value());
     CHECK_EQ(23, CompileRun("foo(5)")->ToInt32(isolate)->Int32Value());
     CHECK_EQ(10, CompileRun("foo(6)")->ToInt32(isolate)->Int32Value());
   }
   isolate->Dispose();
 }