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