From 41b74fd26f8a3937abeec956881c54e6ca9108be Mon Sep 17 00:00:00 2001
From: "yangguo@chromium.org"
 <yangguo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 8 Jul 2014 14:13:50 +0000
Subject: [PATCH] Fix issues with code serializer.

- code pre-aging does not work with serializing.
- compilation info needs to remember that we compile for serializing.
- test case leaks memory.

R=vogelheim@chromium.org

Review URL: https://codereview.chromium.org/379563002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22281 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/compiler.cc              |  3 +++
 src/compiler.h               | 17 ++++++++++++++++-
 src/full-codegen.cc          |  5 +----
 test/cctest/cctest.status    |  3 ---
 test/cctest/test-compiler.cc |  2 ++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/compiler.cc b/src/compiler.cc
index 2b45150..59c6a36 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -981,6 +981,9 @@ Handle<SharedFunctionInfo> Compiler::CompileScript(
     info.SetCachedData(cached_data, cached_data_mode);
     info.SetExtension(extension);
     info.SetContext(context);
+    if (FLAG_serialize_toplevel && cached_data_mode == PRODUCE_CACHED_DATA) {
+      info.PrepareForSerializing();
+    }
     if (FLAG_use_strict) info.SetStrictMode(STRICT);
 
     result = CompileToplevel(&info);
diff --git a/src/compiler.h b/src/compiler.h
index 3aa8458..b0c4e11 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -76,10 +76,12 @@ class CompilationInfo {
     ASSERT(!is_lazy());
     flags_ |= IsEval::encode(true);
   }
+
   void MarkAsGlobal() {
     ASSERT(!is_lazy());
     flags_ |= IsGlobal::encode(true);
   }
+
   void set_parameter_count(int parameter_count) {
     ASSERT(IsStub());
     parameter_count_ = parameter_count;
@@ -88,13 +90,16 @@ class CompilationInfo {
   void set_this_has_uses(bool has_no_uses) {
     this_has_uses_ = has_no_uses;
   }
+
   bool this_has_uses() {
     return this_has_uses_;
   }
+
   void SetStrictMode(StrictMode strict_mode) {
     ASSERT(this->strict_mode() == SLOPPY || this->strict_mode() == strict_mode);
     flags_ = StrictModeField::update(flags_, strict_mode);
   }
+
   void MarkAsNative() {
     flags_ |= IsNative::encode(true);
   }
@@ -155,8 +160,16 @@ class CompilationInfo {
     return IsDebug::decode(flags_);
   }
 
+  void PrepareForSerializing() {
+    ASSERT(!is_lazy());
+    flags_ |= PrepareForSerializing::encode(true);
+  }
+
+  bool will_serialize() const { return PrepareForSerializing::decode(flags_); }
+
   bool IsCodePreAgingActive() const {
-    return FLAG_optimize_for_size && FLAG_age_code && !is_debug();
+    return FLAG_optimize_for_size && FLAG_age_code && !will_serialize() &&
+           !is_debug();
   }
 
   void SetParseRestriction(ParseRestriction restriction) {
@@ -393,6 +406,8 @@ class CompilationInfo {
   class RequiresFrame: public BitField<bool, 13, 1> {};
   // If the function cannot build a frame (for unspecified reasons)
   class MustNotHaveEagerFrame: public BitField<bool, 14, 1> {};
+  // If we plan to serialize the compiled code.
+  class PrepareForSerializing : public BitField<bool, 15, 1> {};
 
   unsigned flags_;
 
diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index cb5e94a..de7faa3 100644
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -301,10 +301,7 @@ bool FullCodeGenerator::MakeCode(CompilationInfo* info) {
   CodeGenerator::MakeCodePrologue(info, "full");
   const int kInitialBufferSize = 4 * KB;
   MacroAssembler masm(info->isolate(), NULL, kInitialBufferSize);
-  if (FLAG_serialize_toplevel &&
-      info->cached_data_mode() == PRODUCE_CACHED_DATA && info->is_global()) {
-    masm.enable_serializer();
-  }
+  if (info->will_serialize()) masm.enable_serializer();
 
 #ifdef ENABLE_GDB_JIT_INTERFACE
   masm.positions_recorder()->StartGDBJITLineInfoRecording();
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index b0a9caf..78f94a0 100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -75,9 +75,6 @@
   # BUG(3287). (test-cpu-profiler/SampleWhenFrameIsNotSetup)
   'test-cpu-profiler/*': [PASS, FLAKY],
 
-  # TODO(yangguo): Temporarily disable code serializer test
-  'test-compiler/SerializeToplevel': [SKIP],
-
   ############################################################################
   # Slow tests.
   'test-api/Threading1': [PASS, ['mode == debug', SLOW]],
diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc
index c77b4b2..8e629b4 100644
--- a/test/cctest/test-compiler.cc
+++ b/test/cctest/test-compiler.cc
@@ -436,6 +436,8 @@ TEST(SerializeToplevel) {
   Handle<Object> result =
       Execution::Call(isolate, fun, global, 0, NULL).ToHandleChecked();
   CHECK_EQ(2, Handle<Smi>::cast(result)->value());
+
+  delete cache;
 }
 
 
-- 
2.7.4