Index: src/arm/regexp-macro-assembler-arm.cc |
diff --git a/src/arm/regexp-macro-assembler-arm.cc b/src/arm/regexp-macro-assembler-arm.cc |
index 0cb80c0ac28654205afe88a5baf57bdb4c03ceea..da7afee3fb50c6cf5ed0235029a3eda7595d0712 100644 |
--- a/src/arm/regexp-macro-assembler-arm.cc |
+++ b/src/arm/regexp-macro-assembler-arm.cc |
@@ -380,12 +380,12 @@ void RegExpMacroAssemblerARM::CheckNotBackReferenceIgnoreCase( |
// Address of current input position. |
__ add(r1, current_input_offset(), Operand(end_of_input_address())); |
// Isolate. |
- __ mov(r3, Operand(ExternalReference::isolate_address())); |
+ __ mov(r3, Operand(ExternalReference::isolate_address(isolate()))); |
{ |
AllowExternalCallThatCantCauseGC scope(masm_); |
ExternalReference function = |
- ExternalReference::re_case_insensitive_compare_uc16(masm_->isolate()); |
+ ExternalReference::re_case_insensitive_compare_uc16(isolate()); |
__ CallCFunction(function, argument_count); |
} |
@@ -682,7 +682,7 @@ Handle<HeapObject> RegExpMacroAssemblerARM::GetCode(Handle<String> source) { |
Label stack_ok; |
ExternalReference stack_limit = |
- ExternalReference::address_of_stack_limit(masm_->isolate()); |
+ ExternalReference::address_of_stack_limit(isolate()); |
__ mov(r0, Operand(stack_limit)); |
__ ldr(r0, MemOperand(r0)); |
__ sub(r0, sp, r0, SetCC); |
@@ -893,9 +893,9 @@ Handle<HeapObject> RegExpMacroAssemblerARM::GetCode(Handle<String> source) { |
__ PrepareCallCFunction(num_arguments, r0); |
__ mov(r0, backtrack_stackpointer()); |
__ add(r1, frame_pointer(), Operand(kStackHighEnd)); |
- __ mov(r2, Operand(ExternalReference::isolate_address())); |
+ __ mov(r2, Operand(ExternalReference::isolate_address(isolate()))); |
ExternalReference grow_stack = |
- ExternalReference::re_grow_stack(masm_->isolate()); |
+ ExternalReference::re_grow_stack(isolate()); |
__ CallCFunction(grow_stack, num_arguments); |
// If return NULL, we have failed to grow the stack, and |
// must exit with a stack-overflow exception. |
@@ -1111,7 +1111,7 @@ void RegExpMacroAssemblerARM::CallCheckStackGuardState(Register scratch) { |
__ mov(r1, Operand(masm_->CodeObject())); |
// r0 becomes return address pointer. |
ExternalReference stack_guard_check = |
- ExternalReference::re_check_stack_guard_state(masm_->isolate()); |
+ ExternalReference::re_check_stack_guard_state(isolate()); |
CallCFunctionUsingStub(stack_guard_check, num_arguments); |
} |
@@ -1292,7 +1292,7 @@ void RegExpMacroAssemblerARM::Pop(Register target) { |
void RegExpMacroAssemblerARM::CheckPreemption() { |
// Check for preemption. |
ExternalReference stack_limit = |
- ExternalReference::address_of_stack_limit(masm_->isolate()); |
+ ExternalReference::address_of_stack_limit(isolate()); |
__ mov(r0, Operand(stack_limit)); |
__ ldr(r0, MemOperand(r0)); |
__ cmp(sp, r0); |
@@ -1302,7 +1302,7 @@ void RegExpMacroAssemblerARM::CheckPreemption() { |
void RegExpMacroAssemblerARM::CheckStackLimit() { |
ExternalReference stack_limit = |
- ExternalReference::address_of_regexp_stack_limit(masm_->isolate()); |
+ ExternalReference::address_of_regexp_stack_limit(isolate()); |
__ mov(r0, Operand(stack_limit)); |
__ ldr(r0, MemOperand(r0)); |
__ cmp(backtrack_stackpointer(), Operand(r0)); |