| OLD | NEW |
| 1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef V8_LOOKUP_INL_H_ | 5 #ifndef V8_LOOKUP_INL_H_ |
| 6 #define V8_LOOKUP_INL_H_ | 6 #define V8_LOOKUP_INL_H_ |
| 7 | 7 |
| 8 #include "src/lookup.h" | 8 #include "src/lookup.h" |
| 9 | 9 |
| 10 namespace v8 { | 10 namespace v8 { |
| 11 namespace internal { | 11 namespace internal { |
| 12 | 12 |
| 13 | 13 |
| 14 JSReceiver* LookupIterator::NextHolder(Map* map) { | 14 JSReceiver* LookupIterator::NextHolder(Map* map) { |
| 15 DisallowHeapAllocation no_gc; | 15 DisallowHeapAllocation no_gc; |
| 16 if (map->prototype()->IsNull()) return NULL; | 16 if (map->prototype()->IsNull()) return NULL; |
| 17 | 17 |
| 18 JSReceiver* next = JSReceiver::cast(map->prototype()); | 18 JSReceiver* next = JSReceiver::cast(map->prototype()); |
| 19 DCHECK(!next->map()->IsGlobalObjectMap() || | 19 DCHECK(!next->map()->IsGlobalObjectMap() || |
| 20 next->map()->is_hidden_prototype()); | 20 next->map()->is_hidden_prototype()); |
| 21 | 21 |
| 22 if (!check_derived() && | 22 if (!check_derived() && |
| 23 !(check_hidden() && next->map()->is_hidden_prototype())) { | 23 !(check_hidden() && next->map()->is_hidden_prototype()) && |
| 24 // Always lookup behind the JSGlobalProxy into the JSGlobalObject, even |
| 25 // when not checking other hidden prototypes. |
| 26 !(map->IsJSGlobalProxyMap() && next->IsJSGlobalObject())) { |
| 24 return NULL; | 27 return NULL; |
| 25 } | 28 } |
| 26 | 29 |
| 27 return next; | 30 return next; |
| 28 } | 31 } |
| 29 | 32 |
| 30 | 33 |
| 31 LookupIterator::State LookupIterator::LookupInHolder(Map* map) { | 34 LookupIterator::State LookupIterator::LookupInHolder(Map* map) { |
| 32 STATIC_ASSERT(INTERCEPTOR == BEFORE_PROPERTY); | 35 STATIC_ASSERT(INTERCEPTOR == BEFORE_PROPERTY); |
| 33 DisallowHeapAllocation no_gc; | 36 DisallowHeapAllocation no_gc; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 60 case JSPROXY: | 63 case JSPROXY: |
| 61 UNREACHABLE(); | 64 UNREACHABLE(); |
| 62 } | 65 } |
| 63 UNREACHABLE(); | 66 UNREACHABLE(); |
| 64 return state_; | 67 return state_; |
| 65 } | 68 } |
| 66 } | 69 } |
| 67 } // namespace v8::internal | 70 } // namespace v8::internal |
| 68 | 71 |
| 69 #endif // V8_LOOKUP_INL_H_ | 72 #endif // V8_LOOKUP_INL_H_ |
| OLD | NEW |