Chromium Code Reviews| Index: src/objects.cc |
| diff --git a/src/objects.cc b/src/objects.cc |
| index cd5bbf40abad07a12afa5e6f45f359bbe8dc2908..6d45649c35d33cb10075d17a78c66d3b85d927a0 100644 |
| --- a/src/objects.cc |
| +++ b/src/objects.cc |
| @@ -7892,31 +7892,6 @@ bool AllocationSiteInfo::GetElementsKindPayload(ElementsKind* kind) { |
| } |
| -// Heuristic: We only need to create allocation site info if the boilerplate |
| -// elements kind is the initial elements kind. |
| -AllocationSiteMode AllocationSiteInfo::GetMode( |
| - ElementsKind boilerplate_elements_kind) { |
| - if (FLAG_track_allocation_sites && |
| - IsFastSmiElementsKind(boilerplate_elements_kind)) { |
| - return TRACK_ALLOCATION_SITE; |
| - } |
| - |
| - return DONT_TRACK_ALLOCATION_SITE; |
| -} |
| - |
| - |
| -AllocationSiteMode AllocationSiteInfo::GetMode(ElementsKind from, |
| - ElementsKind to) { |
| - if (FLAG_track_allocation_sites && |
| - IsFastSmiElementsKind(from) && |
| - (IsFastObjectElementsKind(to) || IsFastDoubleElementsKind(to))) { |
| - return TRACK_ALLOCATION_SITE; |
| - } |
| - |
| - return DONT_TRACK_ALLOCATION_SITE; |
| -} |
| - |
| - |
| uint32_t StringHasher::MakeArrayIndexHash(uint32_t value, int length) { |
| // For array indexes mix the length into the hash as an array index could |
| // be zero. |
| @@ -8361,13 +8336,13 @@ MaybeObject* JSObject::OptimizeAsPrototype() { |
| } |
| -MUST_USE_RESULT static MaybeObject* CacheInitialJSArrayMaps( |
| +MUST_USE_RESULT MaybeObject* CacheInitialJSArrayMaps( |
| Context* native_context, Map* initial_map) { |
| // Replace all of the cached initial array maps in the native context with |
| // the appropriate transitioned elements kind maps. |
| Heap* heap = native_context->GetHeap(); |
| MaybeObject* maybe_maps = |
| - heap->AllocateFixedArrayWithHoles(kElementsKindCount); |
| + heap->AllocateFixedArrayWithHoles(kElementsKindCount, TENURED); |
| FixedArray* maps; |
| if (!maybe_maps->To(&maps)) return maybe_maps; |
| @@ -8421,7 +8396,8 @@ MaybeObject* JSFunction::SetInstancePrototype(Object* value) { |
| Context* native_context = context()->native_context(); |
| Object* array_function = native_context->get(Context::ARRAY_FUNCTION_INDEX); |
| if (array_function->IsJSFunction() && |
| - this == JSFunction::cast(array_function)) { |
| + this == JSFunction::cast(array_function)) { // && |
| + // native_context->js_array_maps()->IsUndefined()) { |
|
Hannes Payer (out of office)
2013/04/18 11:14:39
are you planning to remove this?
mvstanton
2013/04/18 13:39:26
Done.
|
| MaybeObject* ok = CacheInitialJSArrayMaps(native_context, new_map); |
| if (ok->IsFailure()) return ok; |
| } |