Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index f3eb09fa5150b49f756a4979128b3d6309bf8810..76545efcaa7340d53367465692d5b45af32cafef 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -3551,7 +3551,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { |
// stack overflow (on the backtrack stack) was detected in RegExp code but |
// haven't created the exception yet. Handle that in the runtime system. |
// TODO(592): Rerunning the RegExp to get the stack overflow exception. |
- ExternalReference pending_exception(Isolate::k_pending_exception_address, |
+ ExternalReference pending_exception(Isolate::kPendingExceptionAddress, |
masm->isolate()); |
__ mov(edx, |
Operand::StaticVariable(ExternalReference::the_hole_value_location( |
@@ -4341,7 +4341,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm, |
__ j(zero, &failure_returned); |
ExternalReference pending_exception_address( |
- Isolate::k_pending_exception_address, masm->isolate()); |
+ Isolate::kPendingExceptionAddress, masm->isolate()); |
// Check that there is no pending exception, otherwise we |
// should have returned some failure value. |
@@ -4482,11 +4482,11 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
__ push(ebx); |
// Save copies of the top frame descriptor on the stack. |
- ExternalReference c_entry_fp(Isolate::k_c_entry_fp_address, masm->isolate()); |
+ ExternalReference c_entry_fp(Isolate::kCEntryFPAddress, masm->isolate()); |
__ push(Operand::StaticVariable(c_entry_fp)); |
// If this is the outermost JS call, set js_entry_sp value. |
- ExternalReference js_entry_sp(Isolate::k_js_entry_sp_address, |
+ ExternalReference js_entry_sp(Isolate::kJSEntrySPAddress, |
masm->isolate()); |
__ cmp(Operand::StaticVariable(js_entry_sp), Immediate(0)); |
__ j(not_equal, ¬_outermost_js, Label::kNear); |
@@ -4503,7 +4503,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// Caught exception: Store result (exception) in the pending |
// exception field in the JSEnv and return a failure sentinel. |
- ExternalReference pending_exception(Isolate::k_pending_exception_address, |
+ ExternalReference pending_exception(Isolate::kPendingExceptionAddress, |
masm->isolate()); |
__ mov(Operand::StaticVariable(pending_exception), eax); |
__ mov(eax, reinterpret_cast<int32_t>(Failure::Exception())); |
@@ -4554,7 +4554,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// Restore the top frame descriptor from the stack. |
__ pop(Operand::StaticVariable(ExternalReference( |
- Isolate::k_c_entry_fp_address, |
+ Isolate::kCEntryFPAddress, |
masm->isolate()))); |
// Restore callee-saved registers (C calling conventions). |