Index: src/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
index 539b48aafcf79caf13af88043bfd82f1947b1431..86445f67978d0e6b3aefd6b6f138fd06957a453c 100644 |
--- a/src/hydrogen.cc |
+++ b/src/hydrogen.cc |
@@ -4778,7 +4778,10 @@ void HGraphBuilder::VisitObjectLiteral(ObjectLiteral* expr) { |
CHECK_ALIVE(VisitForValue(value)); |
HValue* value = Pop(); |
HInstruction* store; |
- CHECK_ALIVE(store = BuildStoreNamed(literal, value, property)); |
+ CHECK_ALIVE(store = BuildStoreNamed(literal, |
+ value, |
+ property->GetReceiverType(), |
+ property->key())); |
AddInstruction(store); |
if (store->HasObservableSideEffects()) AddSimulate(key->id()); |
} else { |
@@ -5016,14 +5019,13 @@ HInstruction* HGraphBuilder::BuildStoreNamedGeneric(HValue* object, |
HInstruction* HGraphBuilder::BuildStoreNamed(HValue* object, |
HValue* value, |
- ObjectLiteral::Property* prop) { |
- Literal* key = prop->key()->AsLiteral(); |
- Handle<String> name = Handle<String>::cast(key->handle()); |
+ Handle<Map> type, |
+ Expression* key) { |
+ Handle<String> name = Handle<String>::cast(key->AsLiteral()->handle()); |
ASSERT(!name.is_null()); |
LookupResult lookup(isolate()); |
- Handle<Map> type = prop->GetReceiverType(); |
- bool is_monomorphic = prop->IsMonomorphic() && |
+ bool is_monomorphic = !type.is_null() && |
ComputeLoadStoreField(type, name, &lookup, true); |
return is_monomorphic |
@@ -5033,28 +5035,6 @@ HInstruction* HGraphBuilder::BuildStoreNamed(HValue* object, |
} |
-HInstruction* HGraphBuilder::BuildStoreNamed(HValue* object, |
- HValue* value, |
- Expression* expr) { |
- Property* prop = (expr->AsProperty() != NULL) |
- ? expr->AsProperty() |
- : expr->AsAssignment()->target()->AsProperty(); |
- Literal* key = prop->key()->AsLiteral(); |
- Handle<String> name = Handle<String>::cast(key->handle()); |
- ASSERT(!name.is_null()); |
- |
- LookupResult lookup(isolate()); |
- SmallMapList* types = expr->GetReceiverTypes(); |
- bool is_monomorphic = expr->IsMonomorphic() && |
- ComputeLoadStoreField(types->first(), name, &lookup, true); |
- |
- return is_monomorphic |
- ? BuildStoreNamedField(object, name, value, types->first(), &lookup, |
- true) // Needs smi and map check. |
- : BuildStoreNamedGeneric(object, name, value); |
-} |
- |
- |
void HGraphBuilder::HandlePolymorphicLoadNamedField(Property* expr, |
HValue* object, |
SmallMapList* types, |
@@ -5206,7 +5186,12 @@ void HGraphBuilder::HandlePropertyAssignment(Assignment* expr) { |
SmallMapList* types = expr->GetReceiverTypes(); |
if (expr->IsMonomorphic()) { |
- CHECK_ALIVE(instr = BuildStoreNamed(object, value, expr)); |
+ CHECK(expr->AsProperty() == NULL); |
+ Property* prop = expr->AsAssignment()->target()->AsProperty(); |
+ CHECK_ALIVE(instr = BuildStoreNamed(object, |
+ value, |
+ prop->GetReceiverType(), |
+ prop->key())); |
} else if (types != NULL && types->length() > 1) { |
HandlePolymorphicStoreNamedField(expr, object, value, types, name); |
@@ -5386,7 +5371,10 @@ void HGraphBuilder::HandleCompoundAssignment(Assignment* expr) { |
if (instr->HasObservableSideEffects()) AddSimulate(operation->id()); |
HInstruction* store; |
- CHECK_ALIVE(store = BuildStoreNamed(obj, instr, prop)); |
+ CHECK_ALIVE(store = BuildStoreNamed(obj, |
+ instr, |
+ prop->GetReceiverType(), |
+ prop->key())); |
AddInstruction(store); |
// Drop the simulated receiver and value. Return the value. |
Drop(2); |
@@ -7787,7 +7775,10 @@ void HGraphBuilder::VisitCountOperation(CountOperation* expr) { |
input = Pop(); |
HInstruction* store; |
- CHECK_ALIVE(store = BuildStoreNamed(obj, after, prop)); |
+ CHECK_ALIVE(store = BuildStoreNamed(obj, |
+ after, |
+ prop->GetReceiverType(), |
+ prop->key())); |
AddInstruction(store); |
// Overwrite the receiver in the bailout environment with the result |