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

Side by Side Diff: src/heap/objects-visiting.h

Issue 822693002: Do not use out of range visitor ids. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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_OBJECTS_VISITING_H_ 5 #ifndef V8_OBJECTS_VISITING_H_
6 #define V8_OBJECTS_VISITING_H_ 6 #define V8_OBJECTS_VISITING_H_
7 7
8 #include "src/allocation.h" 8 #include "src/allocation.h"
9 #include "src/layout-descriptor.h" 9 #include "src/layout-descriptor.h"
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 bool has_unboxed_fields) { 123 bool has_unboxed_fields) {
124 DCHECK((base == kVisitDataObject) || (base == kVisitStruct) || 124 DCHECK((base == kVisitDataObject) || (base == kVisitStruct) ||
125 (base == kVisitJSObject)); 125 (base == kVisitJSObject));
126 DCHECK(IsAligned(object_size, kPointerSize)); 126 DCHECK(IsAligned(object_size, kPointerSize));
127 DCHECK(kMinObjectSizeInWords * kPointerSize <= object_size); 127 DCHECK(kMinObjectSizeInWords * kPointerSize <= object_size);
128 DCHECK(object_size <= Page::kMaxRegularHeapObjectSize); 128 DCHECK(object_size <= Page::kMaxRegularHeapObjectSize);
129 DCHECK(!has_unboxed_fields || (base == kVisitJSObject)); 129 DCHECK(!has_unboxed_fields || (base == kVisitJSObject));
130 130
131 if (has_unboxed_fields) return generic; 131 if (has_unboxed_fields) return generic;
132 132
133 const VisitorId specialization = static_cast<VisitorId>( 133 int visitor_id =
134 base + (object_size >> kPointerSizeLog2) - kMinObjectSizeInWords); 134 Min(base + (object_size >> kPointerSizeLog2) - kMinObjectSizeInWords,
135 static_cast<int>(generic));
135 136
136 return Min(specialization, generic); 137 return static_cast<VisitorId>(visitor_id);
137 } 138 }
138 }; 139 };
139 140
140 141
141 template <typename Callback> 142 template <typename Callback>
142 class VisitorDispatchTable { 143 class VisitorDispatchTable {
143 public: 144 public:
144 void CopyFrom(VisitorDispatchTable* other) { 145 void CopyFrom(VisitorDispatchTable* other) {
145 // We are not using memcpy to guarantee that during update 146 // We are not using memcpy to guarantee that during update
146 // every element of callbacks_ array will remain correct 147 // every element of callbacks_ array will remain correct
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 // the next element. Given the head of the list, this function removes dead 487 // the next element. Given the head of the list, this function removes dead
487 // elements from the list and if requested records slots for next-element 488 // elements from the list and if requested records slots for next-element
488 // pointers. The template parameter T is a WeakListVisitor that defines how to 489 // pointers. The template parameter T is a WeakListVisitor that defines how to
489 // access the next-element pointers. 490 // access the next-element pointers.
490 template <class T> 491 template <class T>
491 Object* VisitWeakList(Heap* heap, Object* list, WeakObjectRetainer* retainer); 492 Object* VisitWeakList(Heap* heap, Object* list, WeakObjectRetainer* retainer);
492 } 493 }
493 } // namespace v8::internal 494 } // namespace v8::internal
494 495
495 #endif // V8_OBJECTS_VISITING_H_ 496 #endif // V8_OBJECTS_VISITING_H_
OLDNEW
« 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