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

Side by Side Diff: src/lookup-inl.h

Issue 502903002: Remove HolderIsNonGlobalHiddenPrototype since OWN* now also checks globals (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Remove explicit JSGlobalObject check since it's always either that or Null Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/lookup.cc ('k') | src/objects.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_prototype_chain() && 22 if (!check_prototype_chain() &&
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 24 // Always lookup behind the JSGlobalProxy into the JSGlobalObject, even
25 // when not checking other hidden prototypes. 25 // when not checking other hidden prototypes.
mvstanton 2014/08/25 11:10:02 Could you update this comment?
Toon Verwaest 2014/08/25 11:36:27 The comment is still valid. We just don't need to
mvstanton 2014/08/25 11:48:24 Yes, okay. If you have a JSGlobalProxy, then you k
26 !(map->IsJSGlobalProxyMap() && next->IsJSGlobalObject())) { 26 !map->IsJSGlobalProxyMap()) {
27 return NULL; 27 return NULL;
28 } 28 }
29 29
30 return next; 30 return next;
31 } 31 }
32 32
33 33
34 LookupIterator::State LookupIterator::LookupInHolder(Map* map) { 34 LookupIterator::State LookupIterator::LookupInHolder(Map* map) {
35 STATIC_ASSERT(INTERCEPTOR == BEFORE_PROPERTY); 35 STATIC_ASSERT(INTERCEPTOR == BEFORE_PROPERTY);
36 DisallowHeapAllocation no_gc; 36 DisallowHeapAllocation no_gc;
(...skipping 27 matching lines...) Expand all
64 case TRANSITION: 64 case TRANSITION:
65 UNREACHABLE(); 65 UNREACHABLE();
66 } 66 }
67 UNREACHABLE(); 67 UNREACHABLE();
68 return state_; 68 return state_;
69 } 69 }
70 } 70 }
71 } // namespace v8::internal 71 } // namespace v8::internal
72 72
73 #endif // V8_LOOKUP_INL_H_ 73 #endif // V8_LOOKUP_INL_H_
OLDNEW
« no previous file with comments | « src/lookup.cc ('k') | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698