Fix incorrectly factored-out code in https://codereview.chromium.org/20468002/

runtime/vm/flow_graph_optimizer.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 2759 matching lines @@
 
 
 static bool SmiFitsInDouble() { return kSmiBits < 53; }
 
 
 void FlowGraphOptimizer::HandleComparison(ComparisonInstr* comp,
                                           const ICData& ic_data,
                                           Instruction* current_instruction) {
   ASSERT(ic_data.num_args_tested() == 2);
   ASSERT(comp->operation_cid() == kIllegalCid);
-  Instruction* instr = current_iterator()->Current();
   if (HasOnlyTwoSmis(ic_data)) {
-    InsertBefore(instr,
+    InsertBefore(current_instruction,
                  new CheckSmiInstr(comp->left()->Copy(), comp->deopt_id()),
-                 instr->env(),
+                 current_instruction->env(),
                  Definition::kEffect);
-    InsertBefore(instr,
+    InsertBefore(current_instruction,
                  new CheckSmiInstr(comp->right()->Copy(), comp->deopt_id()),
-                 instr->env(),
+                 current_instruction->env(),
                  Definition::kEffect);
     comp->set_operation_cid(kSmiCid);
   } else if (HasTwoMintOrSmi(ic_data) &&
              FlowGraphCompiler::SupportsUnboxedMints()) {
     comp->set_operation_cid(kMintCid);
   } else if (HasTwoDoubleOrSmi(ic_data)) {
     // Use double comparison.
     if (SmiFitsInDouble()) {
       comp->set_operation_cid(kDoubleCid);
     } else {
       if (ICDataHasReceiverArgumentClassIds(ic_data, kSmiCid, kSmiCid)) {
         // We cannot use double comparison on two Smi-s.
         ASSERT(comp->operation_cid() == kIllegalCid);
       } else {
-        InsertBefore(instr,
+        InsertBefore(current_instruction,
                      new CheckEitherNonSmiInstr(comp->left()->Copy(),
                                                 comp->right()->Copy(),
                                                 comp->deopt_id()),
-                     instr->env(),
+                     current_instruction->env(),
                      Definition::kEffect);
         comp->set_operation_cid(kDoubleCid);
       }
     }
   } else {
     ASSERT(comp->operation_cid() == kIllegalCid);
   }
 }
 
 
@@ skipping 4549 matching lines @@
 
   // Insert materializations at environment uses.
   const Class& cls = Class::Handle(alloc->constructor().Owner());
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, cls, *fields);
   }
 }
 
 
 }  // namespace dart