Renaming Unboxed* IL instructions to shorter names.

runtime/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 234 matching lines @@
   M(CatchEntry)                                                                \
   M(BinarySmiOp)                                                               \
   M(UnarySmiOp)                                                                \
   M(CheckStackOverflow)                                                        \
   M(DoubleToDouble)                                                            \
   M(SmiToDouble)                                                               \
   M(CheckClass)                                                                \
   M(CheckSmi)                                                                  \
   M(Constant)                                                                  \
   M(CheckEitherNonSmi)                                                         \
-  M(UnboxedDoubleBinaryOp)                                                     \
+  M(BinaryDoubleOp)                                                            \
   M(MathSqrt)                                                                  \
   M(UnboxDouble)                                                               \
   M(BoxDouble)                                                                 \
   M(UnboxInteger)                                                              \
   M(BoxInteger)                                                                \
-  M(UnboxedMintBinaryOp)                                                       \
-  M(UnboxedMintUnaryOp)                                                        \
+  M(BinaryMintOp)                                                              \
+  M(UnaryMintOp)                                                               \
   M(CheckArrayBound)                                                           \
   M(Constraint)                                                                \
 
 
 #define FORWARD_DECLARATION(type) class type##Instr;
 FOR_EACH_INSTRUCTION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 
 // Functions required in all concrete instruction classes.
@@ skipping 234 matching lines @@
   intptr_t GetDeoptId() const {
     return deopt_id_;
   }
 
  private:
   friend class Definition;  // Needed for InsertBefore, InsertAfter.
 
   // Classes that set deopt_id_.
   friend class UnboxIntegerInstr;
   friend class UnboxDoubleInstr;
-  friend class UnboxedDoubleBinaryOpInstr;
-  friend class UnboxedMintBinaryOpInstr;
-  friend class UnboxedMintUnaryOpInstr;
+  friend class BinaryDoubleOpInstr;
+  friend class BinaryMintOpInstr;
+  friend class UnaryMintOpInstr;
   friend class MathSqrtInstr;
   friend class CheckClassInstr;
   friend class CheckSmiInstr;
   friend class CheckArrayBoundInstr;
   friend class CheckEitherNonSmiInstr;
   friend class LICM;
 
   intptr_t deopt_id_;
   intptr_t lifetime_position_;  // Position used by register allocator.
   Instruction* previous_;
@@ skipping 2929 matching lines @@
   }
 
   DECLARE_INSTRUCTION(MathSqrt)
   virtual RawAbstractType* CompileType() const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MathSqrtInstr);
 };
 
 
-class UnboxedDoubleBinaryOpInstr : public TemplateDefinition<2> {
+class BinaryDoubleOpInstr : public TemplateDefinition<2> {
  public:
-  UnboxedDoubleBinaryOpInstr(Token::Kind op_kind,
+  BinaryDoubleOpInstr(Token::Kind op_kind,
                              Value* left,
                              Value* right,
                              InstanceCallInstr* instance_call)
       : op_kind_(op_kind) {
     ASSERT(left != NULL);
     ASSERT(right != NULL);
     inputs_[0] = left;
     inputs_[1] = right;
     deopt_id_ = instance_call->deopt_id();
   }
 
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual bool HasSideEffect() const { return false; }
 
   virtual bool AffectedBySideEffect() const { return false; }
 
   virtual bool AttributesEqual(Instruction* other) const {
-    return op_kind() == other->AsUnboxedDoubleBinaryOp()->op_kind();
+    return op_kind() == other->AsBinaryDoubleOp()->op_kind();
   }
 
-  // The output is not an instance but when it is boxed it becomes double.
-  virtual intptr_t ResultCid() const { return kDoubleCid; }
+  virtual intptr_t ResultCid() const;
 
   virtual Representation representation() const {
     return kUnboxedDouble;
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT((idx == 0) || (idx == 1));
     return kUnboxedDouble;
   }
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instuction cannot deoptimize, and the deopt-id
     // was inherited from another instuction that could deoptimize.
     return deopt_id_;
   }
 
-  DECLARE_INSTRUCTION(UnboxedDoubleBinaryOp)
+  DECLARE_INSTRUCTION(BinaryDoubleOp)
   virtual RawAbstractType* CompileType() const;
 
  private:
   const Token::Kind op_kind_;
 
-  DISALLOW_COPY_AND_ASSIGN(UnboxedDoubleBinaryOpInstr);
+  DISALLOW_COPY_AND_ASSIGN(BinaryDoubleOpInstr);
 };
 
 
-class UnboxedMintBinaryOpInstr : public TemplateDefinition<2> {
+class BinaryMintOpInstr : public TemplateDefinition<2> {
  public:
-  UnboxedMintBinaryOpInstr(Token::Kind op_kind,
+  BinaryMintOpInstr(Token::Kind op_kind,
                            Value* left,
                            Value* right,
                            InstanceCallInstr* instance_call)
       : op_kind_(op_kind) {
     ASSERT(left != NULL);
     ASSERT(right != NULL);
     inputs_[0] = left;
     inputs_[1] = right;
     deopt_id_ = instance_call->deopt_id();
   }
 
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const {
     return (op_kind() == Token::kADD) || (op_kind() == Token::kSUB);
   }
 
   virtual bool HasSideEffect() const { return false; }
 
   virtual bool AffectedBySideEffect() const { return false; }
 
   virtual bool AttributesEqual(Instruction* other) const {
-    return op_kind() == other->AsUnboxedMintBinaryOp()->op_kind();
+    return op_kind() == other->AsBinaryMintOp()->op_kind();
   }
 
   virtual intptr_t ResultCid() const;
   virtual RawAbstractType* CompileType() const;
 
   virtual Representation representation() const {
     return kUnboxedMint;
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT((idx == 0) || (idx == 1));
     return kUnboxedMint;
   }
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instuction cannot deoptimize, and the deopt-id
     // was inherited from another instuction that could deoptimize.
     return deopt_id_;
   }
 
-  DECLARE_INSTRUCTION(UnboxedMintBinaryOp)
+  DECLARE_INSTRUCTION(BinaryMintOp)
 
  private:
   const Token::Kind op_kind_;
 
-  DISALLOW_COPY_AND_ASSIGN(UnboxedMintBinaryOpInstr);
+  DISALLOW_COPY_AND_ASSIGN(BinaryMintOpInstr);
 };
 
 
-class UnboxedMintUnaryOpInstr : public TemplateDefinition<1> {
+class UnaryMintOpInstr : public TemplateDefinition<1> {
  public:
-  UnboxedMintUnaryOpInstr(Token::Kind op_kind,
+  UnaryMintOpInstr(Token::Kind op_kind,
                           Value* value,
                           InstanceCallInstr* instance_call)
       : op_kind_(op_kind) {
     ASSERT(value != NULL);
     ASSERT(op_kind == Token::kBIT_NOT);
     inputs_[0] = value;
     deopt_id_ = instance_call->deopt_id();
   }
 
   Value* value() const { return inputs_[0]; }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual bool HasSideEffect() const { return false; }
 
   virtual bool AffectedBySideEffect() const { return false; }
 
   virtual bool AttributesEqual(Instruction* other) const {
-    return op_kind() == other->AsUnboxedMintUnaryOp()->op_kind();
+    return op_kind() == other->AsUnaryMintOp()->op_kind();
   }
 
   virtual intptr_t ResultCid() const;
   virtual RawAbstractType* CompileType() const;
 
   virtual Representation representation() const {
     return kUnboxedMint;
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT(idx == 0);
     return kUnboxedMint;
   }
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instuction cannot deoptimize, and the deopt-id
     // was inherited from another instuction that could deoptimize.
     return deopt_id_;
   }
 
-  DECLARE_INSTRUCTION(UnboxedMintUnaryOp)
+  DECLARE_INSTRUCTION(UnaryMintOp)
 
  private:
   const Token::Kind op_kind_;
 
-  DISALLOW_COPY_AND_ASSIGN(UnboxedMintUnaryOpInstr);
+  DISALLOW_COPY_AND_ASSIGN(UnaryMintOpInstr);
 };
 
 
 class BinarySmiOpInstr : public TemplateDefinition<2> {
  public:
   BinarySmiOpInstr(Token::Kind op_kind,
                    InstanceCallInstr* instance_call,
                    Value* left,
                    Value* right)
       : op_kind_(op_kind),
@@ skipping 474 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_