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

Revert "Populate receiver types when there is no type feedback"

Browse Source 
This reverts r20646.

TBR=verwaest@chromium.org

BUG=

Review URL: https://codereview.chromium.org/232903002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20648 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
dcarney@chromium.org 2014-04-10 11:01:09 +00:00
parent 546d0a0b70
commit 956d4f3ca0
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hydrogen.cc
View File

@ -4996,15 +4996,13 @@ void HOptimizedGraphBuilder::VisitRegExpLiteral(RegExpLiteral* expr) {
} }
static bool CanInlinePropertyAccess(Type* type, PropertyAccessType access) { static bool CanInlinePropertyAccess(Type* type) {
if (type->Is(Type::NumberOrString())) return true; if (type->Is(Type::NumberOrString())) return true;
if (!type->IsClass()) return false; if (!type->IsClass()) return false;
Handle<Map> map = type->AsClass(); Handle<Map> map = type->AsClass();
return map->IsJSObjectMap() && return map->IsJSObjectMap() &&
!map->is_dictionary_map() && !map->is_dictionary_map() &&
!map->has_named_interceptor() && !map->has_named_interceptor();
// Must be a LOAD or a non-observed STORE
(access == LOAD || !map->is_observed());
} }
@ -5416,7 +5414,7 @@ HInstruction* HOptimizedGraphBuilder::BuildStoreNamedField(
bool HOptimizedGraphBuilder::PropertyAccessInfo::IsCompatible( bool HOptimizedGraphBuilder::PropertyAccessInfo::IsCompatible(
PropertyAccessInfo* info) { PropertyAccessInfo* info) {
if (!CanInlinePropertyAccess(type_, access_type_)) return false; if (!CanInlinePropertyAccess(type_)) return false;
// Currently only handle Type::Number as a polymorphic case. // Currently only handle Type::Number as a polymorphic case.
// TODO(verwaest): Support monomorphic handling of numbers with a HCheckNumber // TODO(verwaest): Support monomorphic handling of numbers with a HCheckNumber
@ -5517,7 +5515,7 @@ bool HOptimizedGraphBuilder::PropertyAccessInfo::LookupInPrototypes() {
JSObject::TryMigrateInstance(holder_); JSObject::TryMigrateInstance(holder_);
} }
map = Handle<Map>(holder_->map()); map = Handle<Map>(holder_->map());
if (!CanInlinePropertyAccess(ToType(map), access_type_)) { if (!CanInlinePropertyAccess(ToType(map))) {
lookup_.NotFound(); lookup_.NotFound();
return false; return false;
} }
@ -5530,7 +5528,7 @@ bool HOptimizedGraphBuilder::PropertyAccessInfo::LookupInPrototypes() {
bool HOptimizedGraphBuilder::PropertyAccessInfo::CanAccessMonomorphic() { bool HOptimizedGraphBuilder::PropertyAccessInfo::CanAccessMonomorphic() {
if (!CanInlinePropertyAccess(type_, access_type_)) return false; if (!CanInlinePropertyAccess(type_)) return false;
if (IsJSObjectFieldAccessor()) return IsLoad(); if (IsJSObjectFieldAccessor()) return IsLoad();
if (!LookupDescriptor()) return false; if (!LookupDescriptor()) return false;
if (lookup_.IsFound()) { if (lookup_.IsFound()) {
@ -5809,27 +5807,17 @@ void HOptimizedGraphBuilder::HandlePolymorphicNamedFieldAccess(
static bool ComputeReceiverTypes(Expression* expr, static bool ComputeReceiverTypes(Expression* expr,
HValue* receiver, HValue* receiver,
SmallMapList** t, SmallMapList** t,
PropertyAccessType access_type,
Zone* zone) { Zone* zone) {
SmallMapList* types = expr->GetReceiverTypes(); SmallMapList* types = expr->GetReceiverTypes();
*t = types; *t = types;
bool monomorphic = expr->IsMonomorphic(); bool monomorphic = expr->IsMonomorphic();
Isolate* isolate = zone->isolate(); if (types != NULL && receiver->HasMonomorphicJSObjectType()) {
if (types != NULL) {
if (receiver->HasMonomorphicJSObjectType()) {
Map* root_map = receiver->GetMonomorphicJSObjectMap()->FindRootMap(); Map* root_map = receiver->GetMonomorphicJSObjectMap()->FindRootMap();
types->FilterForPossibleTransitions(root_map); types->FilterForPossibleTransitions(root_map);
} else if (types->is_empty() &&
receiver->IsConstant() &&
HConstant::cast(receiver)->handle(isolate)->IsJSObject()) {
Handle<Map> map(Handle<JSObject>::cast(
HConstant::cast(receiver)->handle(isolate))->map());
types->Add(map, zone);
}
monomorphic = types->length() == 1; monomorphic = types->length() == 1;
} }
return monomorphic && CanInlinePropertyAccess( return monomorphic && CanInlinePropertyAccess(
IC::MapToType<Type>(types->first(), zone), access_type); IC::MapToType<Type>(types->first(), zone));
} }
@ -6532,11 +6520,7 @@ HValue* HOptimizedGraphBuilder::HandleKeyedElementAccess(
HInstruction* instr = NULL; HInstruction* instr = NULL;
SmallMapList* types; SmallMapList* types;
bool monomorphic = ComputeReceiverTypes(expr, bool monomorphic = ComputeReceiverTypes(expr, obj, &types, zone());
obj,
&types,
access_type,
zone());
bool force_generic = false; bool force_generic = false;
if (access_type == STORE && if (access_type == STORE &&
@ -6675,7 +6659,7 @@ HInstruction* HOptimizedGraphBuilder::BuildNamedAccess(
HValue* value, HValue* value,
bool is_uninitialized) { bool is_uninitialized) {
SmallMapList* types; SmallMapList* types;
ComputeReceiverTypes(expr, object, &types, access, zone()); ComputeReceiverTypes(expr, object, &types, zone());
ASSERT(types != NULL); ASSERT(types != NULL);
if (types->length() > 0) { if (types->length() > 0) {
@ -7991,7 +7975,7 @@ void HOptimizedGraphBuilder::VisitCall(Call* expr) {
HValue* receiver = Top(); HValue* receiver = Top();
SmallMapList* types; SmallMapList* types;
ComputeReceiverTypes(expr, receiver, &types, LOAD, zone()); ComputeReceiverTypes(expr, receiver, &types, zone());
if (prop->key()->IsPropertyName() && types->length() > 0) { if (prop->key()->IsPropertyName() && types->length() > 0) {
Handle<String> name = prop->key()->AsLiteral()->AsPropertyName(); Handle<String> name = prop->key()->AsLiteral()->AsPropertyName();