| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index 245dcdc482acc08992b5433f9c78f0d3cd667e3d..184b5b5fd4622f7291d601a135d51546fe6e20c2 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -2846,7 +2846,9 @@ void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) {
|
| Immediate(Smi::FromInt(instr->hydrogen()->slot())));
|
| }
|
| ContextualMode mode = instr->for_typeof() ? NOT_CONTEXTUAL : CONTEXTUAL;
|
| - Handle<Code> ic = LoadIC::initialize_stub(isolate(), mode);
|
| + ExtraICState extra_state = LoadIC::ComputeExtraICState(
|
| + mode, LoadIC::NORMAL_LOOKUP);
|
| + Handle<Code> ic = LoadIC::initialize_stub(isolate(), extra_state);
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
| @@ -2988,7 +2990,13 @@ void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) {
|
| __ mov(LoadIC::SlotRegister(),
|
| Immediate(Smi::FromInt(instr->hydrogen()->slot())));
|
| }
|
| - Handle<Code> ic = LoadIC::initialize_stub(isolate(), NOT_CONTEXTUAL);
|
| + LoadIC::PropertyLookupMode lookup_mode =
|
| + instr->is_own_property()
|
| + ? LoadIC::OWN_PROPERTY_LOOKUP
|
| + : LoadIC::NORMAL_LOOKUP;
|
| + ExtraICState extra_state = LoadIC::ComputeExtraICState(
|
| + NOT_CONTEXTUAL, lookup_mode);
|
| + Handle<Code> ic = LoadIC::initialize_stub(isolate(), extra_state);
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
| @@ -3222,7 +3230,13 @@ void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
|
| Immediate(Smi::FromInt(instr->hydrogen()->slot())));
|
| }
|
|
|
| - Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize();
|
| + LoadIC::PropertyLookupMode lookup_mode =
|
| + instr->is_own_property()
|
| + ? LoadIC::OWN_PROPERTY_LOOKUP
|
| + : LoadIC::NORMAL_LOOKUP;
|
| + ExtraICState extra_state = LoadIC::ComputeExtraICState(
|
| + NOT_CONTEXTUAL, lookup_mode);
|
| + Handle<Code> ic = KeyedLoadIC::initialize_stub(isolate(), extra_state);
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
|
|