AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert "Removed one copy-n-paste clone of HGraphBuilder::BuildStoreNamed."

Browse Source 
It inadvertently introduced some performance regressions, e.g. for the
'richards' benchmark.

Review URL: https://chromiumcodereview.appspot.com/10704127

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12023 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
svenpanne@chromium.org 2012-07-10 09:15:03 +00:00
parent 75407ae2b7
commit 5b69228e56
3 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ast.h
View File

@ -1325,6 +1325,7 @@ class ObjectLiteral: public MaterializedLiteral {
// Type feedback information.
void RecordTypeFeedback(TypeFeedbackOracle* oracle);
bool IsMonomorphic() { return !receiver_type_.is_null(); }
Handle<Map> GetReceiverType() { return receiver_type_; }
bool IsCompileTimeValue();
@ -1528,11 +1529,6 @@ class Property: public Expression {
void RecordTypeFeedback(TypeFeedbackOracle* oracle, Zone* zone);
virtual bool IsMonomorphic() { return is_monomorphic_; }
virtual SmallMapList* GetReceiverTypes() { return &receiver_types_; }
Handle<Map> GetReceiverType() {
return IsMonomorphic() ? GetReceiverTypes()->first() : Handle<Map>();
}
bool IsArrayLength() { return is_array_length_; }
bool IsUninitialized() { return is_uninitialized_; }

53
src/hydrogen.cc
View File

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

6
src/hydrogen.h
View File

@ -1149,8 +1149,10 @@ class HGraphBuilder: public AstVisitor {
Handle<String> name);
HInstruction* BuildStoreNamed(HValue* object,
HValue* value,
Handle<Map> type,
Expression* key);
Expression* expr);
HInstruction* BuildStoreNamed(HValue* object,
HValue* value,
ObjectLiteral::Property* prop);
HInstruction* BuildStoreNamedField(HValue* object,
Handle<String> name,
HValue* value,