Disentangle assembler from isolate.

src/arm/codegen-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/arm/codegen-arm.h"
 
 #if V8_TARGET_ARCH_ARM
 
 #include <memory>
 
@@ skipping 150 matching lines @@
   __ mov(chars, Operand(chars, LSL, 31), SetCC);
   // bit0 => Z (ne), bit1 => C (cs)
   __ ldrh(temp1, MemOperand(src, 2, PostIndex), cs);
   __ strh(temp1, MemOperand(dest, 2, PostIndex), cs);
   __ ldrb(temp1, MemOperand(src), ne);
   __ strb(temp1, MemOperand(dest), ne);
   __ Ret();
 
   CodeDesc desc;
   masm.GetCode(&desc);
-  DCHECK(!RelocInfo::RequiresRelocation(desc));
+  DCHECK(!RelocInfo::RequiresRelocation(isolate, desc));
 
   Assembler::FlushICache(isolate, buffer, actual_size);
   base::OS::ProtectCode(buffer, actual_size);
   return FUNCTION_CAST<MemCopyUint8Function>(buffer);
 #endif
 }
 
 
 // Convert 8 to 16. The number of character to copy must be at least 8.
 MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
@@ skipping 96 matching lines @@
   MacroAssembler masm(isolate, buffer, static_cast<int>(actual_size),
                       CodeObjectRequired::kNo);
 
   __ MovFromFloatParameter(d0);
   __ vsqrt(d0, d0);
   __ MovToFloatResult(d0);
   __ Ret();
 
   CodeDesc desc;
   masm.GetCode(&desc);
-  DCHECK(!RelocInfo::RequiresRelocation(desc));
+  DCHECK(!RelocInfo::RequiresRelocation(isolate, desc));
 
   Assembler::FlushICache(isolate, buffer, actual_size);
   base::OS::ProtectCode(buffer, actual_size);
   return FUNCTION_CAST<UnaryMathFunctionWithIsolate>(buffer);
 #endif
 }
 
 #undef __
 
 
@@ skipping 159 matching lines @@
 }
 
 void Code::PatchPlatformCodeAge(Isolate* isolate, byte* sequence,
                                 Code::Age age) {
   uint32_t young_length = isolate->code_aging_helper()->young_sequence_length();
   if (age == kNoAgeCodeAge) {
     isolate->code_aging_helper()->CopyYoungSequenceTo(sequence);
     Assembler::FlushICache(isolate, sequence, young_length);
   } else {
     Code* stub = GetCodeAgeStub(isolate, age);
-    CodePatcher patcher(isolate, sequence,
-                        young_length / Assembler::kInstrSize);
-    patcher.masm()->add(r0, pc, Operand(-8));
-    patcher.masm()->ldr(pc, MemOperand(pc, -4));
-    patcher.masm()->emit_code_stub_address(stub);
+    PatchingAssembler patcher(Assembler::IsolateData(isolate), sequence,
+                              young_length / Assembler::kInstrSize);
+    patcher.add(r0, pc, Operand(-8));
+    patcher.ldr(pc, MemOperand(pc, -4));
+    patcher.emit_code_stub_address(stub);
+    patcher.FlushICache(isolate);
   }
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM