Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(805)

Unified Diff: src/hydrogen.cc

Issue 49553005: Bailout from CanLoadMonomorphic if a prototype with a deprecated map cannot be migrated. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 3b232e6e93ee2d307e5ea9504266825fb9f11b36..2b66903307738ad80ff1a0d50021010b2ceea0d0 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -4765,13 +4765,11 @@ bool HOptimizedGraphBuilder::PropertyAccessInfo::LookupInPrototypes() {
while (map->prototype()->IsJSObject()) {
holder_ = handle(JSObject::cast(map->prototype()));
if (holder_->map()->is_deprecated()) {
- JSObject::TryMigrateInstance(holder_);
+ Handle<Object> result = JSObject::TryMigrateInstance(holder_);
+ if (result.is_null()) return false;
}
map = Handle<Map>(holder_->map());
- if (!CanInlinePropertyAccess(*map)) {
- lookup_.NotFound();
- return false;
- }
+ if (!CanInlinePropertyAccess(*map)) return false;
map->LookupDescriptor(*holder_, *name_, &lookup_);
if (lookup_.IsFound()) return LoadResult(map);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698