Make FlushICache part of Assembler(Base) and take Isolate as parameter.

src/snapshot/serialize.cc

Index: src/snapshot/serialize.cc
diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc
index d66a397b180a9ac5c8c121ef2702baa84980d340..978a695a67dd7ebc0e2b68246b4894e0a2768f44 100644
--- a/src/snapshot/serialize.cc
+++ b/src/snapshot/serialize.cc
@@ -122,7 +122,7 @@ ExternalReferenceTable::ExternalReferenceTable(Isolate* isolate) {
   Add(ExternalReference::invoke_accessor_getter_callback(isolate).address(),
       "InvokeAccessorGetterCallback");
   Add(ExternalReference::flush_icache_function(isolate).address(),
-      "CpuFeatures::FlushICache");
+      "Assembler::FlushICacheWithoutIsolate");
   Add(ExternalReference::log_enter_external_function(isolate).address(),
       "Logger::EnterExternal");
   Add(ExternalReference::log_leave_external_function(isolate).address(),
@@ -505,7 +505,8 @@ void Deserializer::FlushICacheForNewIsolate() {
   PageIterator it(isolate_->heap()->code_space());
   while (it.has_next()) {
     Page* p = it.next();
-    CpuFeatures::FlushICache(p->area_start(), p->area_end() - p->area_start());
+    Assembler::FlushICacheWithoutIsolate(p->area_start(),

[Michael Starzinger, 2015/09/11 11:40:03]

The isolate is available as "isolate_" here, let's use it.

[Michael Lippautz, 2015/09/11 11:54:52]

Done.

+                                         p->area_end() - p->area_start());
   }
 }
 
@@ -513,8 +514,8 @@ void Deserializer::FlushICacheForNewIsolate() {
 void Deserializer::FlushICacheForNewCodeObjects() {
   DCHECK(deserializing_user_code_);
   for (Code* code : new_code_objects_) {
-    CpuFeatures::FlushICache(code->instruction_start(),
-                             code->instruction_size());
+    Assembler::FlushICacheWithoutIsolate(code->instruction_start(),

[Michael Starzinger, 2015/09/11 11:40:03]

Likewise.

[Michael Lippautz, 2015/09/11 11:54:52]

Done.

+                                         code->instruction_size());
   }
 }