Extend and fix tests for custom heap snapshot.

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 545 matching lines @@
         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) { eval (s); }"
+            "  e = function(s) { return eval (s); }"
             "})();"
             "var o = this;"
-            "var r = Math.random();"
-            "var f = (function(a, b) {}).bind(1, 2, 3);");
+            "var r = Math.random() + Math.cos(0);"
+            "var f = (function(a, b) { return a + b; }).bind(1, 2, 3);"
+            "var s = parseInt('12345');");
       }
       // 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.
@@ skipping 28 matching lines @@
       WritePayload(partial_snapshot.RawData(), FLAG_testing_serialization_file);
       WritePayload(startup_snapshot.RawData(), startup_name.start());
 
       startup_name.Dispose();
     }
     v8_isolate->Dispose();
   }
 }
 
 
-UNINITIALIZED_DEPENDENT_TEST(CustomContextDeSerialization,
+UNINITIALIZED_DEPENDENT_TEST(CustomContextDeserialization,
                              CustomContextSerialization) {
+  FLAG_crankshaft = false;
   if (!Snapshot::HaveASnapshotToStartFrom()) {
     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::Isolate* v8_isolate = InitializeFromFile(startup_name.start());
     CHECK(v8_isolate);
     startup_name.Dispose();
     {
       v8::Isolate::Scope isolate_scope(v8_isolate);
@@ skipping 16 matching lines @@
                                                &outdated_contexts)
                    .ToHandleChecked();
         CHECK_EQ(2, outdated_contexts->length());
         CHECK(root->IsContext());
         Handle<Context> context = Handle<Context>::cast(root);
         CHECK(context->global_proxy() == *global_proxy);
         Handle<String> o = isolate->factory()->NewStringFromAsciiChecked("o");
         Handle<JSObject> global_object(context->global_object(), isolate);
         Handle<Object> property = JSObject::GetDataProperty(global_object, o);
         CHECK(property.is_identical_to(global_proxy));
+
+        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")));
       }
     }
     v8_isolate->Dispose();
   }
 }
 
 
 TEST(TestThatAlwaysSucceeds) {
 }
 
@@ skipping 680 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();
 }