Cleanup conversion insertion in unboxed -> unboxed case.

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 382 matching lines @@
   } else if ((from == kUnboxedFloat32x4) && (to == kTagged)) {
     converted = new BoxFloat32x4Instr(use->CopyWithType());
   } else if ((from == kTagged) && (to == kUnboxedUint32x4)) {
     ASSERT((deopt_target != NULL) || (use->Type()->ToCid() == kUint32x4Cid));
     const intptr_t deopt_id = (deopt_target != NULL) ?
         deopt_target->DeoptimizationTarget() : Isolate::kNoDeoptId;
     converted = new UnboxUint32x4Instr(use->CopyWithType(), deopt_id);
   } else if ((from == kUnboxedUint32x4) && (to == kTagged)) {
     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;
-    // We have failed to find a suitable conversion instruction.
-    // Insert a "dummy" conversion instruction with the correct
-    // "to" representation. The inserted instruction will trigger a
-    // a deoptimization if executed. See issue #12417 for a discussion.
+    ASSERT(from != kTagged);
+    ASSERT(to != kTagged);
+    Value* to_value = 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);
+    } 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);
+    } 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);
+    } else if (from == kUnboxedMint) {
+      BoxIntegerInstr* boxed = new BoxIntegerInstr(use->CopyWithType());

[Florian Schneider, 2013/08/21 08:38:51]

You could share the three lines below instead of duplicating them in all if-else
statements:

if (from == kUnboxedDouble) {
  boxed = new BoxDoubleInstr(use->CopyWithType());
} else if (from == kUnboxedUint32x4) {
  boxed = new BoxUint32x4Instr(use->CopyWithType());
} else if (...) {

} else if (...) {

} else {
  UNREACHABLE();
}
use->BindTo(boxed);
InsertBefore(insert_before, boxed, NULL, Definition::kValue);
to_value = new Value(boxed)

if (to == kUnboxedDouble) {

// ...

+      use->BindTo(boxed);
+      InsertBefore(insert_before, boxed, NULL, Definition::kValue);
+      to_value = new Value(boxed);
+    } else {
+      UNIMPLEMENTED();
+    }
+    ASSERT(to_value != NULL);
     if (to == kUnboxedDouble) {
-      converted = new UnboxDoubleInstr(use->CopyWithType(), deopt_id);
+      converted = new UnboxDoubleInstr(to_value, deopt_id);
     } else if (to == kUnboxedUint32x4) {
-      converted = new UnboxDoubleInstr(use->CopyWithType(), deopt_id);
+      converted = new UnboxUint32x4Instr(to_value, deopt_id);
     } else if (to == kUnboxedFloat32x4) {
-      converted = new UnboxDoubleInstr(use->CopyWithType(), deopt_id);
+      converted = new UnboxFloat32x4Instr(to_value, deopt_id);
     } else if (to == kUnboxedMint) {
-      converted = new UnboxIntegerInstr(use->CopyWithType(), deopt_id);
+      converted = new UnboxIntegerInstr(to_value, deopt_id);
+    } else {
+      UNIMPLEMENTED();
     }
   }
   ASSERT(converted != NULL);
   use->BindTo(converted);
   InsertBefore(insert_before, converted, use->instruction()->env(),
                Definition::kValue);
 }
 
 
 void FlowGraphOptimizer::ConvertUse(Value* use, Representation from_rep) {
@@ skipping 7069 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