Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index d3a5ff3f2934f867a2e7aaf84562653b32d2afad..be1477c8b205fd3502da8f9f513cc10888191895 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -3202,10 +3202,10 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
ASSERT(ToRegister(instr->result()).is(eax)); |
__ mov(ecx, instr->name()); |
- RelocInfo::Mode mode = instr->for_typeof() ? RelocInfo::CODE_TARGET : |
- RelocInfo::CODE_TARGET_CONTEXT; |
- Handle<Code> ic = isolate()->builtins()->LoadIC_Initialize(); |
- CallCode(ic, mode, instr); |
+ Handle<Code> ic = instr->for_typeof() |
+ ? isolate()->builtins()->LoadIC_Initialize() |
+ : isolate()->builtins()->LoadIC_Initialize_Contextual(); |
+ CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -3235,9 +3235,9 @@ void LCodeGen::DoStoreGlobalGeneric(LStoreGlobalGeneric* instr) { |
__ mov(ecx, instr->name()); |
Handle<Code> ic = (instr->strict_mode_flag() == kStrictMode) |
- ? isolate()->builtins()->StoreIC_Initialize_Strict() |
+ ? isolate()->builtins()->StoreIC_Initialize_Contextual_Strict() |
: isolate()->builtins()->StoreIC_Initialize(); |
- CallCode(ic, RelocInfo::CODE_TARGET_CONTEXT, instr); |
+ CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -4302,11 +4302,10 @@ void LCodeGen::DoCallNamed(LCallNamed* instr) { |
ASSERT(ToRegister(instr->result()).is(eax)); |
int arity = instr->arity(); |
- RelocInfo::Mode mode = RelocInfo::CODE_TARGET; |
Handle<Code> ic = |
- isolate()->stub_cache()->ComputeCallInitialize(arity, mode); |
+ isolate()->stub_cache()->ComputeCallInitialize(arity, NOT_CONTEXTUAL); |
__ mov(ecx, instr->name()); |
- CallCode(ic, mode, instr); |
+ CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -4331,11 +4330,10 @@ void LCodeGen::DoCallGlobal(LCallGlobal* instr) { |
ASSERT(ToRegister(instr->result()).is(eax)); |
int arity = instr->arity(); |
- RelocInfo::Mode mode = RelocInfo::CODE_TARGET_CONTEXT; |
Handle<Code> ic = |
- isolate()->stub_cache()->ComputeCallInitialize(arity, mode); |
+ isolate()->stub_cache()->ComputeCallInitialize(arity, CONTEXTUAL); |
__ mov(ecx, instr->name()); |
- CallCode(ic, mode, instr); |
+ CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |