Index: src/mips/stub-cache-mips.cc |
diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc |
index cf9f9f6b97b94388f62b256a641b99fb246141ee..841fb06670515c4375476f5b0386d8df1141edee 100644 |
--- a/src/mips/stub-cache-mips.cc |
+++ b/src/mips/stub-cache-mips.cc |
@@ -415,7 +415,7 @@ void StubCompiler::GenerateLoadFunctionPrototype(MacroAssembler* masm, |
// may be clobbered. |
void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
Handle<JSObject> object, |
- int index, |
+ LookupResult* lookup, |
Handle<Map> transition, |
Handle<Name> name, |
Register receiver_reg, |
@@ -428,16 +428,6 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
// a0 : value. |
Label exit; |
- LookupResult lookup(masm->isolate()); |
- object->Lookup(*name, &lookup); |
- if (lookup.IsFound() && (lookup.IsReadOnly() || !lookup.IsCacheable())) { |
- // In sloppy mode, we could just return the value and be done. However, we |
- // might be in strict mode, where we have to throw. Since we cannot tell, |
- // go into slow case unconditionally. |
- __ jmp(miss_label); |
- return; |
- } |
- |
// Check that the map of the object hasn't changed. |
CompareMapMode mode = transition.is_null() ? ALLOW_ELEMENT_TRANSITION_MAPS |
: REQUIRE_EXACT_MAP; |
@@ -452,8 +442,9 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
// Check that we are allowed to write this. |
if (!transition.is_null() && object->GetPrototype()->IsJSObject()) { |
JSObject* holder; |
- if (lookup.IsFound()) { |
- holder = lookup.holder(); |
+ // holder == object indicates that no property was found. |
+ if (lookup->holder() != *object) { |
+ holder = lookup->holder(); |
} else { |
// Find the top object. |
holder = *object; |
@@ -461,8 +452,19 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
holder = JSObject::cast(holder->GetPrototype()); |
} while (holder->GetPrototype()->IsJSObject()); |
} |
- CheckPrototypes(object, receiver_reg, Handle<JSObject>(holder), name_reg, |
- scratch1, scratch2, name, miss_restore_name); |
+ Register holder_reg = CheckPrototypes( |
+ object, receiver_reg, Handle<JSObject>(holder), name_reg, |
+ scratch1, scratch2, name, miss_restore_name); |
+ // If no property was found, and the holder (the last object in the |
+ // prototype chain) is in slow mode, we need to do a negative lookup on the |
+ // holder. |
+ if (lookup->holder() == *object && |
+ !holder->HasFastProperties() && |
+ !holder->IsJSGlobalProxy() && |
+ !holder->IsJSGlobalObject()) { |
+ GenerateDictionaryNegativeLookup( |
+ masm, miss_restore_name, holder_reg, name, scratch1, scratch2); |
+ } |
} |
// Stub never generated for non-global objects that require access |
@@ -483,6 +485,7 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
return; |
} |
+ int index; |
if (!transition.is_null()) { |
// Update the map of the object. |
__ li(scratch1, Operand(transition)); |
@@ -498,6 +501,10 @@ void StubCompiler::GenerateStoreField(MacroAssembler* masm, |
kDontSaveFPRegs, |
OMIT_REMEMBERED_SET, |
OMIT_SMI_CHECK); |
+ index = transition->instance_descriptors()->GetFieldIndex( |
+ transition->LastAdded()); |
+ } else { |
+ index = lookup->GetFieldIndex().field_index(); |
} |
// Adjust for the number of properties stored in the object. Even in the |