Index: src/arm64/macro-assembler-arm64.cc |
diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc |
index b731a97301296141a8d606154a60fc3b4d1899e0..98af78daf8eda216473a09bfba1adc69b25c8fc1 100644 |
--- a/src/arm64/macro-assembler-arm64.cc |
+++ b/src/arm64/macro-assembler-arm64.cc |
@@ -79,7 +79,7 @@ void MacroAssembler::LogicalMacro(const Register& rd, |
LogicalOp op) { |
UseScratchRegisterScope temps(this); |
- if (operand.NeedsRelocation()) { |
+ if (operand.NeedsRelocation(isolate())) { |
Register temp = temps.AcquireX(); |
LoadRelocated(temp, operand); |
Logical(rd, rn, temp, op); |
@@ -270,7 +270,7 @@ void MacroAssembler::Mov(const Register& rd, |
UseScratchRegisterScope temps(this); |
Register dst = (rd.IsSP()) ? temps.AcquireSameSizeAs(rd) : rd; |
- if (operand.NeedsRelocation()) { |
+ if (operand.NeedsRelocation(isolate())) { |
LoadRelocated(dst, operand); |
} else if (operand.IsImmediate()) { |
@@ -318,7 +318,7 @@ void MacroAssembler::Mov(const Register& rd, |
void MacroAssembler::Mvn(const Register& rd, const Operand& operand) { |
ASSERT(allow_macro_instructions_); |
- if (operand.NeedsRelocation()) { |
+ if (operand.NeedsRelocation(isolate())) { |
LoadRelocated(rd, operand); |
mvn(rd, rd); |
@@ -373,7 +373,7 @@ void MacroAssembler::ConditionalCompareMacro(const Register& rn, |
Condition cond, |
ConditionalCompareOp op) { |
ASSERT((cond != al) && (cond != nv)); |
- if (operand.NeedsRelocation()) { |
+ if (operand.NeedsRelocation(isolate())) { |
UseScratchRegisterScope temps(this); |
Register temp = temps.AcquireX(); |
LoadRelocated(temp, operand); |
@@ -439,12 +439,12 @@ void MacroAssembler::AddSubMacro(const Register& rd, |
FlagsUpdate S, |
AddSubOp op) { |
if (operand.IsZero() && rd.Is(rn) && rd.Is64Bits() && rn.Is64Bits() && |
- !operand.NeedsRelocation() && (S == LeaveFlags)) { |
+ !operand.NeedsRelocation(isolate()) && (S == LeaveFlags)) { |
// The instruction would be a nop. Avoid generating useless code. |
return; |
} |
- if (operand.NeedsRelocation()) { |
+ if (operand.NeedsRelocation(isolate())) { |
UseScratchRegisterScope temps(this); |
Register temp = temps.AcquireX(); |
LoadRelocated(temp, operand); |
@@ -470,7 +470,7 @@ void MacroAssembler::AddSubWithCarryMacro(const Register& rd, |
ASSERT(rd.SizeInBits() == rn.SizeInBits()); |
UseScratchRegisterScope temps(this); |
- if (operand.NeedsRelocation()) { |
+ if (operand.NeedsRelocation(isolate())) { |
Register temp = temps.AcquireX(); |
LoadRelocated(temp, operand); |
AddSubWithCarryMacro(rd, rn, temp, S, op); |