Verify that source string matches serialized code.

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 14 matching lines @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <signal.h>
 
 #include <sys/stat.h>
 
 #include "src/v8.h"
 
 #include "src/bootstrapper.h"
+#include "src/compilation-cache.h"
 #include "src/debug.h"
 #include "src/ic-inl.h"
 #include "src/natives.h"
 #include "src/objects.h"
 #include "src/runtime.h"
 #include "src/scopeinfo.h"
 #include "src/serialize.h"
 #include "src/snapshot.h"
 #include "src/spaces.h"
 #include "test/cctest/cctest.h"
@@ skipping 623 matching lines @@
   HeapIterator iterator(CcTest::heap());
   DisallowHeapAllocation no_allocation;
   int counter = 0;
   for (HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next()) {
     if (obj->IsCode() && Code::cast(obj)->kind() == Code::BUILTIN) counter++;
   }
   return counter;
 }
 
 
+static int compile_counter = 0;
+
+void* CreateHistogramForCompiling(const char* name, int min, int max,
+                                  size_t buckets) {
+  if (strcmp(name, "V8.Compile") == 0) return reinterpret_cast<void*>(1);
+  return NULL;
+}
+
+
+void AddHistogramSampleCallback(void* histogram, int sample) {
+  compile_counter++;
+}
+
+
 TEST(SerializeToplevelOnePlusOne) {
   FLAG_serialize_toplevel = true;
   LocalContext context;
+  // We use histogram counters to verify that compile did not trigger when

[mvstanton, 2014/07/15 14:39:36]

Could this "VerifyNoCompilation" stuff be wrapped in something like a scope for
cleaner re-use? I'm thinking it might get used a few more times.

+  // we intend to deserialize code from cache.
+  CcTest::isolate()->SetCreateHistogramFunction(CreateHistogramForCompiling);
+  CcTest::isolate()->SetAddHistogramSampleFunction(AddHistogramSampleCallback);
+  Isolate* isolate = CcTest::i_isolate();
+  isolate->compilation_cache()->Disable();  // Disable same-isolate code cache.
+
   v8::HandleScope scope(CcTest::isolate());
 
-  const char* source1 = "1 + 1";
-  const char* source2 = "1 + 2";  // Use alternate string to verify caching.
+  const char* source = "1 + 1";
 
-  Isolate* isolate = CcTest::i_isolate();
-  Handle<String> source1_string = isolate->factory()
-                                      ->NewStringFromUtf8(CStrVector(source1))
-                                      .ToHandleChecked();
-
-  Handle<String> source2_string = isolate->factory()
-                                      ->NewStringFromUtf8(CStrVector(source2))
-                                      .ToHandleChecked();
+  Handle<String> orig_source = isolate->factory()
+                                   ->NewStringFromUtf8(CStrVector(source))
+                                   .ToHandleChecked();
+  Handle<String> copy_source = isolate->factory()
+                                   ->NewStringFromUtf8(CStrVector(source))
+                                   .ToHandleChecked();
+  CHECK(!orig_source.is_identical_to(copy_source));
+  CHECK(orig_source->Equals(*copy_source));
 
   ScriptData* cache = NULL;
+  compile_counter = 0;
 
   Handle<SharedFunctionInfo> orig =
-      Compiler::CompileScript(source1_string, Handle<String>(), 0, 0, false,
+      Compiler::CompileScript(orig_source, Handle<String>(), 0, 0, false,
                               Handle<Context>(isolate->native_context()), NULL,
                               &cache, PRODUCE_CACHED_DATA, NOT_NATIVES_CODE);
+  CHECK_EQ(1, compile_counter);  // Compile counter was incremented.
 
   int builtins_count = CountBuiltins();
 
   Handle<SharedFunctionInfo> copy =
-      Compiler::CompileScript(source2_string, Handle<String>(), 0, 0, false,
+      Compiler::CompileScript(copy_source, Handle<String>(), 0, 0, false,
                               Handle<Context>(isolate->native_context()), NULL,
                               &cache, CONSUME_CACHED_DATA, NOT_NATIVES_CODE);
-
+  CHECK_EQ(1, compile_counter);  // Compile counter was not incremented.
   CHECK_NE(*orig, *copy);
-  CHECK(Script::cast(copy->script())->source() == *source2_string);
+  CHECK(Script::cast(copy->script())->source() == *copy_source);
 
   Handle<JSFunction> copy_fun =
       isolate->factory()->NewFunctionFromSharedFunctionInfo(
           copy, isolate->native_context());
   Handle<JSObject> global(isolate->context()->global_object());
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, NULL).ToHandleChecked();
   CHECK_EQ(2, Handle<Smi>::cast(copy_result)->value());
 
   CHECK_EQ(builtins_count, CountBuiltins());
 
   delete cache;
 }
 
 
 TEST(SerializeToplevelInternalizedString) {
   FLAG_serialize_toplevel = true;
   LocalContext context;
+  // We use histogram counters to verify that compile did not trigger when
+  // we intend to deserialize code from cache.
+  CcTest::isolate()->SetCreateHistogramFunction(CreateHistogramForCompiling);
+  CcTest::isolate()->SetAddHistogramSampleFunction(AddHistogramSampleCallback);
+  Isolate* isolate = CcTest::i_isolate();
+  isolate->compilation_cache()->Disable();  // Disable same-isolate code cache.
+
   v8::HandleScope scope(CcTest::isolate());
 
-  const char* source1 = "'string1'";
-  const char* source2 = "'string2'";  // Use alternate string to verify caching.
+  const char* source = "'string1'";
 
-  Isolate* isolate = CcTest::i_isolate();
-  Handle<String> source1_string = isolate->factory()
-                                      ->NewStringFromUtf8(CStrVector(source1))
-                                      .ToHandleChecked();
+  Handle<String> orig_source = isolate->factory()
+                                   ->NewStringFromUtf8(CStrVector(source))
+                                   .ToHandleChecked();
+  Handle<String> copy_source = isolate->factory()
+                                   ->NewStringFromUtf8(CStrVector(source))
+                                   .ToHandleChecked();
+  CHECK(!orig_source.is_identical_to(copy_source));
+  CHECK(orig_source->Equals(*copy_source));
 
-  Handle<String> source2_string = isolate->factory()
-                                      ->NewStringFromUtf8(CStrVector(source2))
-                                      .ToHandleChecked();
   Handle<JSObject> global(isolate->context()->global_object());
   ScriptData* cache = NULL;
+  compile_counter = 0;
 
   Handle<SharedFunctionInfo> orig =
-      Compiler::CompileScript(source1_string, Handle<String>(), 0, 0, false,
+      Compiler::CompileScript(orig_source, Handle<String>(), 0, 0, false,
                               Handle<Context>(isolate->native_context()), NULL,
                               &cache, PRODUCE_CACHED_DATA, NOT_NATIVES_CODE);
+  CHECK_EQ(1, compile_counter);  // Compile counter was incremented.
   Handle<JSFunction> orig_fun =
       isolate->factory()->NewFunctionFromSharedFunctionInfo(
           orig, isolate->native_context());
   Handle<Object> orig_result =
       Execution::Call(isolate, orig_fun, global, 0, NULL).ToHandleChecked();
   CHECK(orig_result->IsInternalizedString());
 
   int builtins_count = CountBuiltins();
 
   Handle<SharedFunctionInfo> copy =
-      Compiler::CompileScript(source2_string, Handle<String>(), 0, 0, false,
+      Compiler::CompileScript(copy_source, Handle<String>(), 0, 0, false,
                               Handle<Context>(isolate->native_context()), NULL,
                               &cache, CONSUME_CACHED_DATA, NOT_NATIVES_CODE);
+  CHECK_EQ(1, compile_counter);  // Compile counter was not incremented.
   CHECK_NE(*orig, *copy);
-  CHECK(Script::cast(copy->script())->source() == *source2_string);
+  CHECK(Script::cast(copy->script())->source() == *copy_source);
 
   Handle<JSFunction> copy_fun =
       isolate->factory()->NewFunctionFromSharedFunctionInfo(
           copy, isolate->native_context());
   CHECK_NE(*orig_fun, *copy_fun);
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, NULL).ToHandleChecked();
   CHECK(orig_result.is_identical_to(copy_result));
   Handle<String> expected =
       isolate->factory()->NewStringFromAsciiChecked("string1");
 
   CHECK(Handle<String>::cast(copy_result)->Equals(*expected));
   CHECK_EQ(builtins_count, CountBuiltins());
 
   delete cache;
 }