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

Unified Diff: src/lookup.cc

Issue 321543004: Rewrite GetPropertyAttribute to use the LookupIterator (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Remove bogus asserts Created 6 years, 6 months 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 | « src/lookup.h ('k') | src/objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/lookup.cc
diff --git a/src/lookup.cc b/src/lookup.cc
index 6131ac96d0177c2139dab715212096a497b18cef..5391640ac1f1f1a3e7dc4f6f831b2c6724b039c2 100644
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -53,11 +53,12 @@ bool LookupIterator::NextHolder() {
Handle<JSReceiver> next(JSReceiver::cast(holder_map_->prototype()));
if (!check_derived() &&
- // TODO(verwaest): Check if this is actually necessary currently. If it
- // is, this should be handled by setting is_hidden_prototype on the
- // global object behind the proxy.
- !holder_map_->IsJSGlobalProxyMap() &&
- !next->map()->is_hidden_prototype()) {
+ !(check_hidden() &&
+ // TODO(verwaest): Check if this is actually necessary currently. If it
+ // is, this should be handled by setting is_hidden_prototype on the
+ // global object behind the proxy.
+ (holder_map_->IsJSGlobalProxyMap() ||
+ next->map()->is_hidden_prototype()))) {
return false;
}
@@ -189,8 +190,6 @@ Handle<Object> LookupIterator::GetDataValue() const {
ASSERT_EQ(DATA, property_kind_);
Handle<Object> value = FetchValue();
if (value->IsTheHole()) {
- ASSERT_EQ(DICTIONARY, property_encoding_);
- ASSERT(GetHolder()->IsGlobalObject());
ASSERT(property_details_.IsReadOnly());
return factory()->undefined_value();
}
« no previous file with comments | « src/lookup.h ('k') | src/objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698