Reviewers: Sven Panne,

Description:
Flush ICache after deserializing code.

[email protected]

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

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

Affected files (+3, -5 lines):
  M src/serialize.h
  M src/serialize.cc
  M test/cctest/cctest.status


Index: src/serialize.cc
diff --git a/src/serialize.cc b/src/serialize.cc
index da298a4b5d19c5e42c24bb42a329a80161037af5..ca7adcbaa1a0910f371b4918b10949ba79cd7c91 100644
--- a/src/serialize.cc
+++ b/src/serialize.cc
@@ -1907,6 +1907,7 @@ Object* CodeSerializer::Deserialize(Isolate* isolate, ScriptData* data) {
   }
   Object* root;
   deserializer.DeserializePartial(isolate, &root);
+  deserializer.FlushICacheForNewCodeObjects();
   ASSERT(root->IsSharedFunctionInfo());
   return root;
 }
Index: src/serialize.h
diff --git a/src/serialize.h b/src/serialize.h
index df9cb68f4d21aa5f869b9033c9d69975133df566..6cc90eaafc2bb01c65da5b951634a8360e0f89c3 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -249,6 +249,8 @@ class Deserializer: public SerializerDeserializer {
     reservations_[space_number] = reservation;
   }

+  void FlushICacheForNewCodeObjects();
+
  private:
   virtual void VisitPointers(Object** start, Object** end);

@@ -286,8 +288,6 @@ class Deserializer: public SerializerDeserializer {
     return HeapObject::FromAddress(high_water_[space] - offset);
   }

-  void FlushICacheForNewCodeObjects();
-
   // Cached current isolate.
   Isolate* isolate_;

Index: test/cctest/cctest.status
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index 40859c1e76d6055300418d25ad1cd2df7de4f4c7..7820f15204d16957f82b8a7331fe86b0b52d89c0 100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -175,9 +175,6 @@
##############################################################################
 ['arch == arm', {

-  # Temporarily disabled test
-  'test-compiler/SerializeToplevel': [SKIP],
-
   # BUG(355): Test crashes on ARM.
   'test-log/ProfLazyMode': [SKIP],



--
--
v8-dev mailing list
[email protected]
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 [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to