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

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

Issue 661583004: Revert "Limit the number of transitions allowed per hidden class." Due to crashes in ClearMapTransi… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 1 month 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/objects.cc ('k') | src/transitions.h » ('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 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 // Review notes: 5 // Review notes:
6 // 6 //
7 // - The use of macros in these inline functions may seem superfluous 7 // - The use of macros in these inline functions may seem superfluous
8 // but it is absolutely needed to make sure gcc generates optimal 8 // but it is absolutely needed to make sure gcc generates optimal
9 // code. gcc is not happy when attempting to inline too deep. 9 // code. gcc is not happy when attempting to inline too deep.
10 // 10 //
(...skipping 5185 matching lines...) Expand 10 before | Expand all | Expand 10 after
5196 5196
5197 5197
5198 Map* Map::elements_transition_map() { 5198 Map* Map::elements_transition_map() {
5199 int index = transitions()->Search(GetHeap()->elements_transition_symbol()); 5199 int index = transitions()->Search(GetHeap()->elements_transition_symbol());
5200 return transitions()->GetTarget(index); 5200 return transitions()->GetTarget(index);
5201 } 5201 }
5202 5202
5203 5203
5204 bool Map::CanHaveMoreTransitions() { 5204 bool Map::CanHaveMoreTransitions() {
5205 if (!HasTransitionArray()) return true; 5205 if (!HasTransitionArray()) return true;
5206 return transitions()->number_of_transitions() <= 5206 return FixedArray::SizeFor(transitions()->length() +
5207 TransitionArray::kMaxNumberOfTransitions; 5207 TransitionArray::kTransitionSize)
5208 <= Page::kMaxRegularHeapObjectSize;
5208 } 5209 }
5209 5210
5210 5211
5211 Map* Map::GetTransition(int transition_index) { 5212 Map* Map::GetTransition(int transition_index) {
5212 return transitions()->GetTarget(transition_index); 5213 return transitions()->GetTarget(transition_index);
5213 } 5214 }
5214 5215
5215 5216
5216 int Map::SearchTransition(Name* name) { 5217 int Map::SearchTransition(Name* name) {
5217 if (HasTransitionArray()) return transitions()->Search(name); 5218 if (HasTransitionArray()) return transitions()->Search(name);
(...skipping 1769 matching lines...) Expand 10 before | Expand all | Expand 10 after
6987 void Map::ClearCodeCache(Heap* heap) { 6988 void Map::ClearCodeCache(Heap* heap) {
6988 // No write barrier is needed since empty_fixed_array is not in new space. 6989 // No write barrier is needed since empty_fixed_array is not in new space.
6989 // Please note this function is used during marking: 6990 // Please note this function is used during marking:
6990 // - MarkCompactCollector::MarkUnmarkedObject 6991 // - MarkCompactCollector::MarkUnmarkedObject
6991 // - IncrementalMarking::Step 6992 // - IncrementalMarking::Step
6992 DCHECK(!heap->InNewSpace(heap->empty_fixed_array())); 6993 DCHECK(!heap->InNewSpace(heap->empty_fixed_array()));
6993 WRITE_FIELD(this, kCodeCacheOffset, heap->empty_fixed_array()); 6994 WRITE_FIELD(this, kCodeCacheOffset, heap->empty_fixed_array());
6994 } 6995 }
6995 6996
6996 6997
6997 int Map::SlackForArraySize(int old_size, int size_limit) {
6998 const int max_slack = size_limit - old_size;
6999 DCHECK(max_slack >= 0);
7000 if (old_size < 4) return Min(max_slack, 1);
7001 return Min(max_slack, old_size / 2);
7002 }
7003
7004
7005 void JSArray::EnsureSize(Handle<JSArray> array, int required_size) { 6998 void JSArray::EnsureSize(Handle<JSArray> array, int required_size) {
7006 DCHECK(array->HasFastSmiOrObjectElements()); 6999 DCHECK(array->HasFastSmiOrObjectElements());
7007 Handle<FixedArray> elts = handle(FixedArray::cast(array->elements())); 7000 Handle<FixedArray> elts = handle(FixedArray::cast(array->elements()));
7008 const int kArraySizeThatFitsComfortablyInNewSpace = 128; 7001 const int kArraySizeThatFitsComfortablyInNewSpace = 128;
7009 if (elts->length() < required_size) { 7002 if (elts->length() < required_size) {
7010 // Doubling in size would be overkill, but leave some slack to avoid 7003 // Doubling in size would be overkill, but leave some slack to avoid
7011 // constantly growing. 7004 // constantly growing.
7012 Expand(array, required_size + (required_size >> 3)); 7005 Expand(array, required_size + (required_size >> 3));
7013 // It's a performance benefit to keep a frequently used array in new-space. 7006 // It's a performance benefit to keep a frequently used array in new-space.
7014 } else if (!array->GetHeap()->new_space()->Contains(*elts) && 7007 } else if (!array->GetHeap()->new_space()->Contains(*elts) &&
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
7285 #undef READ_SHORT_FIELD 7278 #undef READ_SHORT_FIELD
7286 #undef WRITE_SHORT_FIELD 7279 #undef WRITE_SHORT_FIELD
7287 #undef READ_BYTE_FIELD 7280 #undef READ_BYTE_FIELD
7288 #undef WRITE_BYTE_FIELD 7281 #undef WRITE_BYTE_FIELD
7289 #undef NOBARRIER_READ_BYTE_FIELD 7282 #undef NOBARRIER_READ_BYTE_FIELD
7290 #undef NOBARRIER_WRITE_BYTE_FIELD 7283 #undef NOBARRIER_WRITE_BYTE_FIELD
7291 7284
7292 } } // namespace v8::internal 7285 } } // namespace v8::internal
7293 7286
7294 #endif // V8_OBJECTS_INL_H_ 7287 #endif // V8_OBJECTS_INL_H_
OLDNEW
« no previous file with comments | « src/objects.cc ('k') | src/transitions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698