Chromium Code Reviews| Index: src/hydrogen.cc |
| diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
| index 6059a2a65317b2d9dfba4505ad2ca835e339523e..a55c366cceb10b045ff4c43773b0502d4797316b 100644 |
| --- a/src/hydrogen.cc |
| +++ b/src/hydrogen.cc |
| @@ -2293,11 +2293,8 @@ HValue* HGraphBuilder::BuildAllocateElements(ElementsKind kind, |
| HValue* total_size = AddUncasted<HAdd>(mul, header_size); |
| total_size->ClearFlag(HValue::kCanOverflow); |
| - PretenureFlag pretenure_flag = !FLAG_allocation_site_pretenuring ? |
| - isolate()->heap()->GetPretenureMode() : NOT_TENURED; |
| - |
| - return Add<HAllocate>(total_size, HType::NonPrimitive(), |
| - pretenure_flag, instance_type); |
| + return Add<HAllocate>(total_size, HType::NonPrimitive(), NOT_TENURED, |
| + instance_type); |
| } |
| @@ -5482,12 +5479,10 @@ HInstruction* HOptimizedGraphBuilder::BuildStoreNamedField( |
| NoObservableSideEffectsScope no_side_effects(this); |
| HInstruction* heap_number_size = Add<HConstant>(HeapNumber::kSize); |
| - PretenureFlag pretenure_flag = !FLAG_allocation_site_pretenuring ? |
| - isolate()->heap()->GetPretenureMode() : NOT_TENURED; |
| - |
| + // TODO(hpayer): Allocation site pretenuring support. |
| HInstruction* heap_number = Add<HAllocate>(heap_number_size, |
| HType::HeapNumber(), |
| - pretenure_flag, |
| + NOT_TENURED, |
| HEAP_NUMBER_TYPE); |
| AddStoreMapConstant(heap_number, isolate()->factory()->heap_number_map()); |
| Add<HStoreNamedField>(heap_number, HObjectAccess::ForHeapNumberValue(), |
| @@ -8576,9 +8571,6 @@ void HOptimizedGraphBuilder::VisitCallNew(CallNew* expr) { |
| AllocationSite::AddDependentCompilationInfo(allocation_site, |
| AllocationSite::TENURING, |
| top_info()); |
| - } else { |
| - allocation_mode = HAllocationMode( |
| - isolate()->heap()->GetPretenureMode()); |
| } |
| } |
| @@ -9522,15 +9514,12 @@ HValue* HOptimizedGraphBuilder::BuildBinaryOperation( |
| Maybe<int> fixed_right_arg = expr->fixed_right_arg(); |
| Handle<AllocationSite> allocation_site = expr->allocation_site(); |
| - PretenureFlag pretenure_flag = !FLAG_allocation_site_pretenuring ? |
| - isolate()->heap()->GetPretenureMode() : NOT_TENURED; |
| - |
| HAllocationMode allocation_mode = |
| FLAG_allocation_site_pretenuring |
|
Benedikt Meurer
2014/05/27 06:27:41
Nit: Simplify condition
Hannes Payer (out of office)
2014/05/27 07:43:38
Done.
|
| ? (allocation_site.is_null() |
| ? HAllocationMode(NOT_TENURED) |
| : HAllocationMode(allocation_site)) |
| - : HAllocationMode(pretenure_flag); |
| + : HAllocationMode(NOT_TENURED); |
| HValue* result = HGraphBuilder::BuildBinaryOperation( |
| expr->op(), left, right, left_type, right_type, result_type, |
| @@ -10237,7 +10226,7 @@ HInstruction* HOptimizedGraphBuilder::BuildFastLiteral( |
| HValue* object_size_constant = Add<HConstant>( |
| boilerplate_object->map()->instance_size()); |
| - PretenureFlag pretenure_flag = isolate()->heap()->GetPretenureMode(); |
| + PretenureFlag pretenure_flag = NOT_TENURED; |
| if (FLAG_allocation_site_pretenuring) { |
| pretenure_flag = site_context->current()->GetPretenureMode(); |
| Handle<AllocationSite> site(site_context->current()); |