Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index ef30b68effd384cf6106fd8b3463e8be0724306b..13fbc2acf404c5b1be6b0e24f049f5eea5f47e4b 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -2130,7 +2130,7 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
ASSERT(ToRegister(instr->result()).is(eax)); |
__ mov(ecx, instr->name()); |
- Handle<Code> ic(isolate()->builtins()->builtin(Builtins::LoadIC_Initialize)); |
+ Handle<Code> ic = Builtins::builtin(Builtins::LoadIC_Initialize, isolate()); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -2255,8 +2255,8 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { |
ASSERT(ToRegister(instr->object()).is(edx)); |
ASSERT(ToRegister(instr->key()).is(eax)); |
- Handle<Code> ic(isolate()->builtins()->builtin( |
- Builtins::KeyedLoadIC_Initialize)); |
+ Handle<Code> ic = Builtins::builtin(Builtins::KeyedLoadIC_Initialize, |
+ isolate()); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -2813,8 +2813,7 @@ void LCodeGen::DoCallNew(LCallNew* instr) { |
ASSERT(ToRegister(instr->constructor()).is(edi)); |
ASSERT(ToRegister(instr->result()).is(eax)); |
- Handle<Code> builtin(isolate()->builtins()->builtin( |
- Builtins::JSConstructCall)); |
+ Handle<Code> builtin =Builtins::builtin(Builtins::JSConstructCall, isolate()); |
__ Set(eax, Immediate(instr->arity())); |
CallCode(builtin, RelocInfo::CONSTRUCT_CALL, instr); |
} |
@@ -2861,9 +2860,10 @@ void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) { |
ASSERT(ToRegister(instr->value()).is(eax)); |
__ mov(ecx, instr->name()); |
- Handle<Code> ic(isolate()->builtins()->builtin( |
- info_->is_strict() ? Builtins::StoreIC_Initialize_Strict |
- : Builtins::StoreIC_Initialize)); |
+ Builtins::Name builtin = info_->is_strict() |
+ ? Builtins::StoreIC_Initialize_Strict |
+ : Builtins::StoreIC_Initialize; |
+ Handle<Code> ic = Builtins::builtin(builtin, isolate()); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -2931,9 +2931,10 @@ void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) { |
ASSERT(ToRegister(instr->key()).is(ecx)); |
ASSERT(ToRegister(instr->value()).is(eax)); |
- Handle<Code> ic(isolate()->builtins()->builtin( |
- info_->is_strict() ? Builtins::KeyedStoreIC_Initialize_Strict |
- : Builtins::KeyedStoreIC_Initialize)); |
+ Builtins::Name builtin = info_->is_strict() |
+ ? Builtins::KeyedStoreIC_Initialize_Strict |
+ : Builtins::KeyedStoreIC_Initialize; |
+ Handle<Code> ic = Builtins::builtin(builtin, isolate()); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |