Reviewers: Yang,

Message:
Yang, could you please take a look, thanks.

Description:
Add serializer support for builtins pointed by InnerPointer for out-of-line
constant pool.

This is required for test-serialize tests which fail at the DCHECK on L1874 of
serialize.cc otherwise.

Please review this at https://codereview.chromium.org/475753002/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+7, -0 lines):
  M src/serialize.cc


Index: src/serialize.cc
diff --git a/src/serialize.cc b/src/serialize.cc
index 4b28d23fe9ac060f73c46c84fb5076739c99a7f5..ccea532ff8e1e5cda0339cfa1addd1109c91e48e 100644
--- a/src/serialize.cc
+++ b/src/serialize.cc
@@ -1118,6 +1118,12 @@ void Deserializer::ReadChunk(Object** current,
       // Find a builtin and write a pointer to it to the current object.
       CASE_STATEMENT(kBuiltin, kPlain, kStartOfObject, 0)
       CASE_BODY(kBuiltin, kPlain, kStartOfObject, 0)
+#if V8_OOL_CONSTANT_POOL
+      // Find a builtin code entry and write a pointer to it to the current
+      // object.
+      CASE_STATEMENT(kBuiltin, kPlain, kInnerPointer, 0)
+      CASE_BODY(kBuiltin, kPlain, kInnerPointer, 0)
+#endif
// Find a builtin and write a pointer to it in the current code object.
       CASE_STATEMENT(kBuiltin, kFromCode, kInnerPointer, 0)
       CASE_BODY(kBuiltin, kFromCode, kInnerPointer, 0)
@@ -1866,6 +1872,7 @@ void CodeSerializer::SerializeBuiltin(Code* builtin, HowToCode how_to_code,
   }

   DCHECK((how_to_code == kPlain && where_to_point == kStartOfObject) ||
+         (how_to_code == kPlain && where_to_point == kInnerPointer) ||
          (how_to_code == kFromCode && where_to_point == kInnerPointer));
   int builtin_index = builtin->builtin_index();
   DCHECK_LT(builtin_index, Builtins::builtin_count);


--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to