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

vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 82 matching lines @@
   M(ExtractConstructorInstantiator, ExtractConstructorInstantiatorComp)        \
   M(AllocateContext, AllocateContextComp)                                      \
   M(ChainContext, ChainContextComp)                                            \
   M(CloneContext, CloneContextComp)                                            \
   M(CatchEntry, CatchEntryComp)                                                \
   M(BinaryOp, BinaryOpComp)                                                    \
   M(DoubleBinaryOp, DoubleBinaryOpComp)                                        \
   M(UnarySmiOp, UnarySmiOpComp)                                                \
   M(NumberNegate, NumberNegateComp)                                            \
   M(CheckStackOverflow, CheckStackOverflowComp)                                \
-  M(ToDouble, ToDoubleComp)                                                    \
+  M(DoubleToDouble, DoubleToDoubleComp)                                        \
+  M(SmiToDouble, SmiToDoubleComp)
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 // Forward declarations.
 class BindInstr;
 class BranchInstr;
 class BufferFormatter;
@@ skipping 1586 matching lines @@
   virtual bool CanDeoptimize() const { return false; }
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckStackOverflowComp);
 };
 
 
-class ToDoubleComp : public TemplateComputation<1> {
+class DoubleToDoubleComp : public TemplateComputation<1> {
  public:
-  ToDoubleComp(Value* value,
-               intptr_t from,
-               InstanceCallComp* instance_call)
-      : from_(from), instance_call_(instance_call) {
+  DoubleToDoubleComp(Value* value, InstanceCallComp* instance_call)

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

Don't need instance_call, pass int deopt_id and try_index.

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

Since the deopt_id has to agree for correctness, I'd rather not pass it. Both
are duplicated from the instance call.

+      : instance_call_(instance_call) {
     ASSERT(value != NULL);
     inputs_[0] = value;
   }
 
   Value* value() const { return inputs_[0]; }
-  intptr_t from() const { return from_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
-  virtual void PrintOperandsTo(BufferFormatter* f) const;
-
-  DECLARE_COMPUTATION(ToDouble)
+  DECLARE_COMPUTATION(DoubleToDouble)
 
   virtual bool CanDeoptimize() const { return true; }
 
  private:
-  const intptr_t from_;
   InstanceCallComp* instance_call_;
 
-  DISALLOW_COPY_AND_ASSIGN(ToDoubleComp);
+  DISALLOW_COPY_AND_ASSIGN(DoubleToDoubleComp);
 };
 
 
+class SmiToDoubleComp : public TemplateComputation<0> {

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

Shouldn't this be TemplateComputation<1> ?

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

This instruction is implemented as call with pushed arguments. Therefore, zero
inputs. The flow graph optimizer does not remove the PushArgument instruction
for its input in this case.

+ public:
+  explicit SmiToDoubleComp(InstanceCallComp* instance_call)
+      : instance_call_(instance_call) { }
+
+  Value* value() const { return inputs_[0]; }

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

I forgot to remove this function. I'll remove it before committing.

+
+  InstanceCallComp* instance_call() const { return instance_call_; }
+
+  DECLARE_CALL_COMPUTATION(SmiToDouble)
+
+  virtual intptr_t ArgumentCount() const { return 1; }
+
+  virtual bool CanDeoptimize() const { return true; }
+
+ private:
+  InstanceCallComp* instance_call_;
+
+  DISALLOW_COPY_AND_ASSIGN(SmiToDoubleComp);
+};
+
+
 #undef DECLARE_COMPUTATION
 
 
 // Implementation of type testers and cast functins.
 #define DEFINE_PREDICATE(ShortName, ClassName)                                 \
 bool Computation::Is##ShortName() const {                                      \
   return computation_kind() == k##ShortName;                                   \
 }                                                                              \
 const ClassName* Computation::As##ShortName() const {                          \
   if (!Is##ShortName()) return NULL;                                           \
@@ skipping 1158 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_