Index: src/ia32/regexp-macro-assembler-ia32.cc |
diff --git a/src/ia32/regexp-macro-assembler-ia32.cc b/src/ia32/regexp-macro-assembler-ia32.cc |
index a25aabc97baa988cbe7fe409f83714cc79caaf86..f1c773b8374fbf6821cf020e7c6946e6c4a44a80 100644 |
--- a/src/ia32/regexp-macro-assembler-ia32.cc |
+++ b/src/ia32/regexp-macro-assembler-ia32.cc |
@@ -393,7 +393,7 @@ void RegExpMacroAssemblerIA32::CheckNotBackReferenceIgnoreCase( |
__ mov(Operand(esp, 0 * kPointerSize), edx); |
ExternalReference compare = |
- ExternalReference::re_case_insensitive_compare_uc16(); |
+ ExternalReference::re_case_insensitive_compare_uc16(masm_->isolate()); |
__ CallCFunction(compare, argument_count); |
// Pop original values before reacting on result value. |
__ pop(ebx); |
@@ -679,7 +679,7 @@ Handle<Object> RegExpMacroAssemblerIA32::GetCode(Handle<String> source) { |
Label stack_ok; |
ExternalReference stack_limit = |
- ExternalReference::address_of_stack_limit(); |
+ ExternalReference::address_of_stack_limit(masm_->isolate()); |
__ mov(ecx, esp); |
__ sub(ecx, Operand::StaticVariable(stack_limit)); |
// Handle it if the stack pointer is already below the stack limit. |
@@ -843,7 +843,8 @@ Handle<Object> RegExpMacroAssemblerIA32::GetCode(Handle<String> source) { |
__ lea(eax, Operand(ebp, kStackHighEnd)); |
__ mov(Operand(esp, 1 * kPointerSize), eax); |
__ mov(Operand(esp, 0 * kPointerSize), backtrack_stackpointer()); |
- ExternalReference grow_stack = ExternalReference::re_grow_stack(); |
+ ExternalReference grow_stack = |
+ ExternalReference::re_grow_stack(masm_->isolate()); |
__ CallCFunction(grow_stack, num_arguments); |
// If return NULL, we have failed to grow the stack, and |
// must exit with a stack-overflow exception. |
@@ -867,12 +868,11 @@ Handle<Object> RegExpMacroAssemblerIA32::GetCode(Handle<String> source) { |
CodeDesc code_desc; |
masm_->GetCode(&code_desc); |
- Isolate* isolate = ISOLATE; |
Handle<Code> code = |
- isolate->factory()->NewCode(code_desc, |
- Code::ComputeFlags(Code::REGEXP), |
- masm_->CodeObject()); |
- PROFILE(isolate, RegExpCodeCreateEvent(*code, *source)); |
+ masm_->isolate()->factory()->NewCode(code_desc, |
+ Code::ComputeFlags(Code::REGEXP), |
+ masm_->CodeObject()); |
+ PROFILE(masm_->isolate(), RegExpCodeCreateEvent(*code, *source)); |
return Handle<Object>::cast(code); |
} |
@@ -1027,7 +1027,7 @@ void RegExpMacroAssemblerIA32::CallCheckStackGuardState(Register scratch) { |
__ lea(eax, Operand(esp, -kPointerSize)); |
__ mov(Operand(esp, 0 * kPointerSize), eax); |
ExternalReference check_stack_guard = |
- ExternalReference::re_check_stack_guard_state(); |
+ ExternalReference::re_check_stack_guard_state(masm_->isolate()); |
__ CallCFunction(check_stack_guard, num_arguments); |
} |
@@ -1201,7 +1201,7 @@ void RegExpMacroAssemblerIA32::CheckPreemption() { |
// Check for preemption. |
Label no_preempt; |
ExternalReference stack_limit = |
- ExternalReference::address_of_stack_limit(); |
+ ExternalReference::address_of_stack_limit(masm_->isolate()); |
__ cmp(esp, Operand::StaticVariable(stack_limit)); |
__ j(above, &no_preempt, taken); |
@@ -1214,7 +1214,7 @@ void RegExpMacroAssemblerIA32::CheckPreemption() { |
void RegExpMacroAssemblerIA32::CheckStackLimit() { |
Label no_stack_overflow; |
ExternalReference stack_limit = |
- ExternalReference::address_of_regexp_stack_limit(); |
+ ExternalReference::address_of_regexp_stack_limit(masm_->isolate()); |
__ cmp(backtrack_stackpointer(), Operand::StaticVariable(stack_limit)); |
__ j(above, &no_stack_overflow); |