Split ToDouble into two IL instruction to make it work with SSA.

vm/flow_graph_optimizer.cc

 // Copyright (c) 2012, 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/flow_graph_builder.h"
 #include "vm/il_printer.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
@@ skipping 360 matching lines @@
   if ((ic_data.NumberOfChecks() == 0) || !HasOneTarget(ic_data)) {
     // No type feedback collected.
     return false;
   }
   Function& target = Function::Handle();
   GrowableArray<intptr_t> class_ids;
   ic_data.GetCheckAt(0, &class_ids, &target);
   MethodRecognizer::Kind recognized_kind =
       MethodRecognizer::RecognizeKind(target);
 
-  intptr_t from_class_id;
-  if (recognized_kind == MethodRecognizer::kDoubleToDouble) {
-    from_class_id = kDoubleCid;
-  } else if (recognized_kind == MethodRecognizer::kIntegerToDouble) {
-    from_class_id = kSmiCid;
-  } else {
-    return false;
+  if ((recognized_kind == MethodRecognizer::kDoubleToDouble) &&
+      (class_ids[0] == kDoubleCid)) {
+    DoubleToDoubleComp* d2d_comp =
+        new DoubleToDoubleComp(comp->ArgumentAt(0)->value(), comp);
+    instr->set_computation(d2d_comp);
+    RemovePushArguments(comp);
+    return true;
+  } else if ((recognized_kind == MethodRecognizer::kIntegerToDouble) &&
+             (class_ids[0] == kSmiCid)) {

[srdjan, 2012/08/14 21:21:26]

No else needed, previous if terminates with a return.

[Florian Schneider, 2012/08/15 10:27:23]

Done.

+    SmiToDoubleComp* s2d_comp = new SmiToDoubleComp(comp);
+    instr->set_computation(s2d_comp);
+    // Pushed arguments are not removed because SmiToDouble is implemented
+    // as a call.
+    return true;
   }
-
-  if (class_ids[0] != from_class_id) {
-    return false;
-  }
-  ToDoubleComp* coerce = new ToDoubleComp(
-      comp->ArgumentAt(0)->value(), from_class_id, comp);
-  instr->set_computation(coerce);
-  RemovePushArguments(comp);
-  return true;
+  return false;
 }
 
 
 void FlowGraphOptimizer::VisitInstanceCall(InstanceCallComp* comp,
                                            BindInstr* instr) {
   if (comp->HasICData() && (comp->ic_data()->NumberOfChecks() > 0)) {
     const Token::Kind op_kind = comp->token_kind();
     if (Token::IsBinaryToken(op_kind) &&
         TryReplaceWithBinaryOp(instr, comp, op_kind)) {
       return;
@@ skipping 310 matching lines @@
       LocationSummary* locs = it.Current()->locs();
       if ((locs != NULL) && locs->contains_call()) {
         is_leaf_ = false;
         return;
       }
     }
   }
 }
 
 }  // namespace dart