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

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

Issue 1157943003: Replace ad-hoc weakness in transition array with WeakCell. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Remove redundant dchecks Created 5 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 unified diff | Download patch
« src/heap/mark-compact.cc ('K') | « src/transitions.cc ('k') | 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_TRANSITIONS_INL_H_ 5 #ifndef V8_TRANSITIONS_INL_H_
6 #define V8_TRANSITIONS_INL_H_ 6 #define V8_TRANSITIONS_INL_H_
7 7
8 #include "src/transitions.h" 8 #include "src/transitions.h"
9 9
10 namespace v8 { 10 namespace v8 {
(...skipping 29 matching lines...) Expand all
40 return RawFieldOfElementAt(kPrototypeTransitionsIndex); 40 return RawFieldOfElementAt(kPrototypeTransitionsIndex);
41 } 41 }
42 42
43 43
44 Object** TransitionArray::GetKeySlot(int transition_number) { 44 Object** TransitionArray::GetKeySlot(int transition_number) {
45 DCHECK(transition_number < number_of_transitions()); 45 DCHECK(transition_number < number_of_transitions());
46 return RawFieldOfElementAt(ToKeyIndex(transition_number)); 46 return RawFieldOfElementAt(ToKeyIndex(transition_number));
47 } 47 }
48 48
49 49
50 Object** TransitionArray::GetTargetSlot(int transition_number) {
51 DCHECK(transition_number < number_of_transitions());
52 return RawFieldOfElementAt(ToTargetIndex(transition_number));
53 }
54
55
50 Name* TransitionArray::GetKey(int transition_number) { 56 Name* TransitionArray::GetKey(int transition_number) {
51 DCHECK(transition_number < number_of_transitions()); 57 DCHECK(transition_number < number_of_transitions());
52 return Name::cast(get(ToKeyIndex(transition_number))); 58 return Name::cast(get(ToKeyIndex(transition_number)));
53 } 59 }
54 60
55 61
56 Name* TransitionArray::GetKey(Object* raw_transitions, int transition_number) { 62 Name* TransitionArray::GetKey(Object* raw_transitions, int transition_number) {
57 if (IsSimpleTransition(raw_transitions)) { 63 if (IsSimpleTransition(raw_transitions)) {
58 DCHECK(transition_number == 0); 64 DCHECK(transition_number == 0);
59 return GetSimpleTransitionKey(GetSimpleTransition(raw_transitions)); 65 return GetSimpleTransitionKey(GetSimpleTransition(raw_transitions));
60 } 66 }
61 DCHECK(IsFullTransitionArray(raw_transitions)); 67 DCHECK(IsFullTransitionArray(raw_transitions));
62 return TransitionArray::cast(raw_transitions)->GetKey(transition_number); 68 return TransitionArray::cast(raw_transitions)->GetKey(transition_number);
63 } 69 }
64 70
65 71
66 void TransitionArray::SetKey(int transition_number, Name* key) { 72 void TransitionArray::SetKey(int transition_number, Name* key) {
67 DCHECK(transition_number < number_of_transitions()); 73 DCHECK(transition_number < number_of_transitions());
68 set(ToKeyIndex(transition_number), key); 74 set(ToKeyIndex(transition_number), key);
69 } 75 }
70 76
71 77
72 Map* TransitionArray::GetTarget(int transition_number) { 78 Map* TransitionArray::GetTarget(int transition_number) {
73 DCHECK(transition_number < number_of_transitions()); 79 DCHECK(transition_number < number_of_transitions());
74 return Map::cast(get(ToTargetIndex(transition_number))); 80 WeakCell* cell = GetTargetCell(transition_number);
81 return Map::cast(cell->value());
75 } 82 }
76 83
77 84
78 Map* TransitionArray::GetTarget(Object* raw_transitions, 85 Map* TransitionArray::GetTarget(Object* raw_transitions,
79 int transition_number) { 86 int transition_number) {
80 if (IsSimpleTransition(raw_transitions)) { 87 if (IsSimpleTransition(raw_transitions)) {
81 DCHECK(transition_number == 0); 88 DCHECK(transition_number == 0);
82 return GetSimpleTransition(raw_transitions); 89 return GetSimpleTransition(raw_transitions);
83 } 90 }
84 DCHECK(IsFullTransitionArray(raw_transitions)); 91 DCHECK(IsFullTransitionArray(raw_transitions));
85 return TransitionArray::cast(raw_transitions)->GetTarget(transition_number); 92 return TransitionArray::cast(raw_transitions)->GetTarget(transition_number);
86 } 93 }
87 94
88 95
89 void TransitionArray::SetTarget(int transition_number, Map* value) { 96 WeakCell* TransitionArray::GetTargetCell(int transition_number) {
97 DCHECK(transition_number < number_of_transitions());
98 return WeakCell::cast(get(ToTargetIndex(transition_number)));
99 }
100
101
102 void TransitionArray::SetTargetCell(int transition_number, WeakCell* value) {
90 DCHECK(transition_number < number_of_transitions()); 103 DCHECK(transition_number < number_of_transitions());
91 set(ToTargetIndex(transition_number), value); 104 set(ToTargetIndex(transition_number), value);
92 } 105 }
93 106
94 107
95 int TransitionArray::SearchName(Name* name, int* out_insertion_index) { 108 int TransitionArray::SearchName(Name* name, int* out_insertion_index) {
96 return internal::Search<ALL_ENTRIES>(this, name, 0, out_insertion_index); 109 return internal::Search<ALL_ENTRIES>(this, name, 0, out_insertion_index);
97 } 110 }
98 111
99 112
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 PropertyDetails TransitionArray::GetTargetDetails(Name* name, Map* target) { 164 PropertyDetails TransitionArray::GetTargetDetails(Name* name, Map* target) {
152 DCHECK(!IsSpecialTransition(name)); 165 DCHECK(!IsSpecialTransition(name));
153 int descriptor = target->LastAdded(); 166 int descriptor = target->LastAdded();
154 DescriptorArray* descriptors = target->instance_descriptors(); 167 DescriptorArray* descriptors = target->instance_descriptors();
155 // Transitions are allowed only for the last added property. 168 // Transitions are allowed only for the last added property.
156 DCHECK(descriptors->GetKey(descriptor)->Equals(name)); 169 DCHECK(descriptors->GetKey(descriptor)->Equals(name));
157 return descriptors->GetDetails(descriptor); 170 return descriptors->GetDetails(descriptor);
158 } 171 }
159 172
160 173
161 void TransitionArray::NoIncrementalWriteBarrierSet(int transition_number, 174 void TransitionArray::Set(int transition_number, Name* key, WeakCell* target) {
162 Name* key, 175 set(ToKeyIndex(transition_number), key);
163 Map* target) { 176 set(ToTargetIndex(transition_number), target);
164 FixedArray::NoIncrementalWriteBarrierSet(
165 this, ToKeyIndex(transition_number), key);
166 FixedArray::NoIncrementalWriteBarrierSet(
167 this, ToTargetIndex(transition_number), target);
168 } 177 }
169 178
170 179
171 void TransitionArray::SetNumberOfTransitions(int number_of_transitions) { 180 void TransitionArray::SetNumberOfTransitions(int number_of_transitions) {
172 DCHECK(number_of_transitions <= Capacity(this)); 181 DCHECK(number_of_transitions <= Capacity(this));
173 set(kTransitionLengthIndex, Smi::FromInt(number_of_transitions)); 182 set(kTransitionLengthIndex, Smi::FromInt(number_of_transitions));
174 } 183 }
175 184
176 } } // namespace v8::internal 185 } } // namespace v8::internal
177 186
178 #endif // V8_TRANSITIONS_INL_H_ 187 #endif // V8_TRANSITIONS_INL_H_
OLDNEW
« src/heap/mark-compact.cc ('K') | « src/transitions.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698