Index: src/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
index da499922a17423059e9473806cd322cf8074c9cd..cdea6caee8e2773b3090822ae5ef8a357ee45702 100644 |
--- a/src/hydrogen.cc |
+++ b/src/hydrogen.cc |
@@ -3215,12 +3215,6 @@ void HGraph::RestoreActualValues() { |
} |
-void HGraphBuilder::PushAndAdd(HInstruction* instr) { |
- Push(instr); |
- AddInstruction(instr); |
-} |
- |
- |
template <class Instruction> |
HInstruction* HOptimizedGraphBuilder::PreProcessCall(Instruction* call) { |
int count = call->argument_count(); |
@@ -3898,9 +3892,7 @@ void HOptimizedGraphBuilder::VisitForInStatement(ForInStatement* stmt) { |
set_current_block(body_exit); |
HValue* current_index = Pop(); |
- HInstruction* new_index = New<HAdd>(current_index, |
- graph()->GetConstant1()); |
- PushAndAdd(new_index); |
+ Push(Add<HAdd>(current_index, graph()->GetConstant1())); |
body_exit = current_block(); |
} |
@@ -5327,7 +5319,8 @@ void HOptimizedGraphBuilder::HandleCompoundAssignment(Assignment* expr) { |
HValue* left = Pop(); |
HInstruction* instr = BuildBinaryOperation(operation, left, right); |
- PushAndAdd(instr); |
+ AddInstruction(instr); |
+ Push(instr); |
if (instr->HasObservableSideEffects()) { |
Add<HSimulate>(operation->id(), REMOVABLE_SIMULATE); |
} |
@@ -6961,9 +6954,9 @@ bool HOptimizedGraphBuilder::TryCallApply(Call* expr) { |
} |
Drop(arguments_count - 1); |
- PushAndAdd(New<HPushArgument>(Pop())); |
+ Push(Add<HPushArgument>(Pop())); |
for (int i = 1; i < arguments_count; i++) { |
- PushAndAdd(New<HPushArgument>(arguments_values->at(i))); |
+ Push(Add<HPushArgument>(arguments_values->at(i))); |
} |
HInvokeFunction* call = New<HInvokeFunction>(function, |
@@ -7076,8 +7069,8 @@ void HOptimizedGraphBuilder::VisitCall(Call* expr) { |
if (known_global_function) { |
// Push the global object instead of the global receiver because |
// code generated by the full code generator expects it. |
- HGlobalObject* global_object = New<HGlobalObject>(); |
- PushAndAdd(global_object); |
+ HGlobalObject* global_object = Add<HGlobalObject>(); |
+ Push(global_object); |
CHECK_ALIVE(VisitExpressions(expr->arguments())); |
CHECK_ALIVE(VisitForValue(expr->expression())); |
@@ -7116,7 +7109,7 @@ void HOptimizedGraphBuilder::VisitCall(Call* expr) { |
} |
} else { |
HGlobalObject* receiver = Add<HGlobalObject>(); |
- PushAndAdd(New<HPushArgument>(receiver)); |
+ Push(Add<HPushArgument>(receiver)); |
CHECK_ALIVE(VisitArgumentList(expr->arguments())); |
call = New<HCallGlobal>(var->name(), argument_count); |
@@ -7129,8 +7122,8 @@ void HOptimizedGraphBuilder::VisitCall(Call* expr) { |
CHECK_ALIVE(VisitForValue(expr->expression())); |
HValue* function = Top(); |
HGlobalObject* global = Add<HGlobalObject>(); |
- HGlobalReceiver* receiver = New<HGlobalReceiver>(global); |
- PushAndAdd(receiver); |
+ HGlobalReceiver* receiver = Add<HGlobalReceiver>(global); |
+ Push(receiver); |
CHECK_ALIVE(VisitExpressions(expr->arguments())); |
Add<HCheckValue>(function, expr->target()); |
@@ -7156,7 +7149,7 @@ void HOptimizedGraphBuilder::VisitCall(Call* expr) { |
HValue* function = Top(); |
HGlobalObject* global_object = Add<HGlobalObject>(); |
HGlobalReceiver* receiver = Add<HGlobalReceiver>(global_object); |
- PushAndAdd(New<HPushArgument>(receiver)); |
+ Push(Add<HPushArgument>(receiver)); |
CHECK_ALIVE(VisitArgumentList(expr->arguments())); |
call = New<HCallFunction>(function, argument_count); |