Rewrite GetPropertyAttribute to use the LookupIterator

src/lookup.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/bootstrapper.h"
 #include "src/lookup.h"
 
 namespace v8 {
@@ skipping 35 matching lines @@
   return handle(Handle<HeapObject>::cast(receiver)->map());
 }
 
 
 bool LookupIterator::NextHolder() {
   if (holder_map_->prototype()->IsNull()) return false;
 
   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;
   }
 
   holder_map_ = handle(next->map());
   maybe_holder_ = next;
   return true;
 }
 
 
 LookupIterator::State LookupIterator::LookupInHolder() {
@@ skipping 111 matching lines @@
   ASSERT_EQ(ACCESSOR, property_kind_);
   return FetchValue();
 }
 
 
 Handle<Object> LookupIterator::GetDataValue() const {
   ASSERT(has_property_);
   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();
   }
   return value;
 }
 
 
 } }  // namespace v8::internal