| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index 66bd6b55d3dad229569a35892ebc6d9153b3a3bd..1f69dbe0f5d778a848e09414ffcdb8435c4b1f65 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -1295,7 +1295,7 @@ void StoreBufferOverflowStub::Generate(MacroAssembler* masm) {
|
|
|
| AllowExternalCallThatCantCauseGC scope(masm);
|
| __ PrepareCallCFunction(argument_count, fp_argument_count, scratch);
|
| - __ mov(r0, Operand(ExternalReference::isolate_address()));
|
| + __ mov(r0, Operand(ExternalReference::isolate_address(masm->isolate())));
|
| __ CallCFunction(
|
| ExternalReference::store_buffer_overflow_function(masm->isolate()),
|
| argument_count);
|
| @@ -3102,7 +3102,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm,
|
| }
|
| #endif
|
|
|
| - __ mov(r2, Operand(ExternalReference::isolate_address()));
|
| + __ mov(r2, Operand(ExternalReference::isolate_address(isolate)));
|
|
|
| // To let the GC traverse the return address of the exit frames, we need to
|
| // know where the return address is. The CEntryStub is unmovable, so
|
| @@ -4319,7 +4319,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
|
| // Arguments are before that on the stack or in registers.
|
|
|
| // Argument 9 (sp[20]): Pass current isolate address.
|
| - __ mov(r0, Operand(ExternalReference::isolate_address()));
|
| + __ mov(r0, Operand(ExternalReference::isolate_address(isolate)));
|
| __ str(r0, MemOperand(sp, 5 * kPointerSize));
|
|
|
| // Argument 8 (sp[16]): Indicate that this is a direct call from JavaScript.
|
| @@ -6916,7 +6916,7 @@ void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm, Mode mode) {
|
| __ Move(address, regs_.address());
|
| __ Move(r0, regs_.object());
|
| __ Move(r1, address);
|
| - __ mov(r2, Operand(ExternalReference::isolate_address()));
|
| + __ mov(r2, Operand(ExternalReference::isolate_address(masm->isolate())));
|
|
|
| AllowExternalCallThatCantCauseGC scope(masm);
|
| if (mode == INCREMENTAL_COMPACTION) {
|
|
|