Provide a helper to generate multiple Lithium instructions for one Hydrogen instruction.

src/arm/lithium-arm.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8.h"
 
 #include "lithium-allocator-inl.h"
 #include "arm/lithium-arm.h"
 #include "arm/lithium-codegen-arm.h"
 #include "hydrogen-osr.h"
@@ skipping 816 matching lines @@
       dummy->set_hydrogen_value(current);
       chunk_->AddInstruction(dummy, current_block_);
     }
   } else {
     instr = current->CompileToLithium(this);
   }
 
   argument_count_ += current->argument_delta();
   ASSERT(argument_count_ >= 0);
 
+  CheckAndAddInstruction(instr, current);
+
+  current_instruction_ = old_current;
+}
+
+
+void LChunkBuilder::CheckAndAddInstruction(LInstruction* instr,

[Jakob Kummerow, 2014/05/22 12:59:46]

I'd call this just AddInstruction...

[Alexandre Rames, 2014/05/22 13:15:43]

Done.

+                                           HInstruction* hydrogen_val) {
   if (instr != NULL) {

[Jakob Kummerow, 2014/05/22 12:59:46]

...and move this check to the caller. I don't think other callers need the
flexibility to pass in NULL.

[Alexandre Rames, 2014/05/22 13:15:43]

Done.

     // Associate the hydrogen instruction first, since we may need it for
     // the ClobbersRegisters() or ClobbersDoubleRegisters() calls below.
-    instr->set_hydrogen_value(current);
+    instr->set_hydrogen_value(hydrogen_val);
 
 #if DEBUG
     // Make sure that the lithium instruction has either no fixed register
     // constraints in temps or the result OR no uses that are only used at
     // start. If this invariant doesn't hold, the register allocator can decide
     // to insert a split of a range immediately before the instruction due to an
     // already allocated register needing to be used for the instruction's fixed
     // register constraint. In this case, The register allocator won't see an
     // interference between the split child and the use-at-start (it would if
     // the it was just a plain use), so it is free to move the split child into
@@ skipping 20 matching lines @@
 
     if (FLAG_stress_pointer_maps && !instr->HasPointerMap()) {
       instr = AssignPointerMap(instr);
     }
     if (FLAG_stress_environments && !instr->HasEnvironment()) {
       instr = AssignEnvironment(instr);
     }
     chunk_->AddInstruction(instr, current_block_);
 
     if (instr->IsCall()) {
-      HValue* hydrogen_value_for_lazy_bailout = current;
+      HValue* hydrogen_value_for_lazy_bailout = hydrogen_val;
       LInstruction* instruction_needing_environment = NULL;
-      if (current->HasObservableSideEffects()) {
-        HSimulate* sim = HSimulate::cast(current->next());
+      if (hydrogen_val->HasObservableSideEffects()) {
+        HSimulate* sim = HSimulate::cast(hydrogen_val->next());
         instruction_needing_environment = instr;
         sim->ReplayEnvironment(current_block_->last_environment());
         hydrogen_value_for_lazy_bailout = sim;
       }
       LInstruction* bailout = AssignEnvironment(new(zone()) LLazyBailout());
       bailout->set_hydrogen_value(hydrogen_value_for_lazy_bailout);
       chunk_->AddInstruction(bailout, current_block_);
       if (instruction_needing_environment != NULL) {
         // Store the lazy deopt environment with the instruction if needed.
         // Right now it is only used for LInstanceOfKnownGlobal.
         instruction_needing_environment->
             SetDeferredLazyDeoptimizationEnvironment(bailout->environment());
       }
     }
   }
-  current_instruction_ = old_current;
 }
 
 
 LInstruction* LChunkBuilder::DoGoto(HGoto* instr) {
   return new(zone()) LGoto(instr->FirstSuccessor());
 }
 
 
 LInstruction* LChunkBuilder::DoBranch(HBranch* instr) {
   LInstruction* goto_instr = CheckElideControlInstruction(instr);
@@ skipping 1653 matching lines @@
 
 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) {
   LOperand* object = UseRegister(instr->object());
   LOperand* index = UseTempRegister(instr->index());
   LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index);
   LInstruction* result = DefineSameAsFirst(load);
   return AssignPointerMap(result);
 }
 
 } }  // namespace v8::internal