Final cleanup of InsertConversion

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 390 matching lines @@
     converted = new BoxUint32x4Instr(use->CopyWithType());
   } else {
     // We have failed to find a suitable conversion instruction.
     // Insert two "dummy" conversion instructions with the correct
     // "from" and "to" representation. The inserted instructions will
     // trigger a deoptimization if executed. See #12417 for a discussion.
     const intptr_t deopt_id = (deopt_target != NULL) ?
         deopt_target->DeoptimizationTarget() : Isolate::kNoDeoptId;
     ASSERT(from != kTagged);
     ASSERT(to != kTagged);
-    Value* to_value = NULL;
+    Definition* boxed = NULL;
     if (from == kUnboxedDouble) {
-      BoxDoubleInstr* boxed = new BoxDoubleInstr(use->CopyWithType());
-      use->BindTo(boxed);
-      InsertBefore(insert_before, boxed, NULL, Definition::kValue);
-      to_value = new Value(boxed);
+      boxed = new BoxDoubleInstr(use->CopyWithType());
     } else if (from == kUnboxedUint32x4) {
-      BoxUint32x4Instr* boxed = new BoxUint32x4Instr(use->CopyWithType());
-      use->BindTo(boxed);
-      InsertBefore(insert_before, boxed, NULL, Definition::kValue);
-      to_value = new Value(boxed);
+      boxed = new BoxUint32x4Instr(use->CopyWithType());
     } else if (from == kUnboxedFloat32x4) {
-      BoxFloat32x4Instr* boxed = new BoxFloat32x4Instr(use->CopyWithType());
-      use->BindTo(boxed);
-      InsertBefore(insert_before, boxed, NULL, Definition::kValue);
-      to_value = new Value(boxed);
+      boxed = new BoxFloat32x4Instr(use->CopyWithType());
     } else if (from == kUnboxedMint) {
-      BoxIntegerInstr* boxed = new BoxIntegerInstr(use->CopyWithType());
-      use->BindTo(boxed);
-      InsertBefore(insert_before, boxed, NULL, Definition::kValue);
-      to_value = new Value(boxed);
+      boxed = new BoxIntegerInstr(use->CopyWithType());
     } else {
       UNIMPLEMENTED();
     }
-    ASSERT(to_value != NULL);
+    use->BindTo(boxed);
+    InsertBefore(insert_before, boxed, NULL, Definition::kValue);
+    Value* to_value = new Value(boxed);
     if (to == kUnboxedDouble) {
       converted = new UnboxDoubleInstr(to_value, deopt_id);
     } else if (to == kUnboxedUint32x4) {
       converted = new UnboxUint32x4Instr(to_value, deopt_id);
     } else if (to == kUnboxedFloat32x4) {
       converted = new UnboxFloat32x4Instr(to_value, deopt_id);
     } else if (to == kUnboxedMint) {
       converted = new UnboxIntegerInstr(to_value, deopt_id);
     } else {
       UNIMPLEMENTED();
@@ skipping 7071 matching lines @@
   }
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, alloc->cls(), *fields);
   }
 }
 
 
 }  // namespace dart