Disentangle assembler from isolate.

src/arm/deoptimizer-arm.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/assembler-inl.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/objects-inl.h"
 #include "src/register-configuration.h"
@@ skipping 24 matching lines @@
   code->InvalidateRelocation();
 
   if (FLAG_zap_code_space) {
     // Fail hard and early if we enter this code object again.
     byte* pointer = code->FindCodeAgeSequence();
     if (pointer != NULL) {
       pointer += kNoCodeAgeSequenceLength;
     } else {
       pointer = code->instruction_start();
     }
-    CodePatcher patcher(isolate, pointer, 1);
-    patcher.masm()->bkpt(0);
+
+    {
+      PatchingAssembler patcher(Assembler::IsolateData(isolate), pointer, 1);
+      patcher.bkpt(0);
+      patcher.FlushICache(isolate);
+    }
 
     DeoptimizationInputData* data =
         DeoptimizationInputData::cast(code->deoptimization_data());
     int osr_offset = data->OsrPcOffset()->value();
     if (osr_offset > 0) {
-      CodePatcher osr_patcher(isolate, code->instruction_start() + osr_offset,
-                              1);
-      osr_patcher.masm()->bkpt(0);
+      PatchingAssembler patcher(Assembler::IsolateData(isolate),
+                                code->instruction_start() + osr_offset, 1);
+      patcher.bkpt(0);
+      patcher.FlushICache(isolate);
     }
   }
 
   DeoptimizationInputData* deopt_data =
       DeoptimizationInputData::cast(code->deoptimization_data());
 #ifdef DEBUG
   Address prev_call_address = NULL;
 #endif
   // For each LLazyBailout instruction insert a call to the corresponding
   // deoptimization entry.
@@ skipping 304 matching lines @@
 void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
   DCHECK(FLAG_enable_embedded_constant_pool);
   SetFrameSlot(offset, value);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8