Fix StoreIndexedInstr input representation requirements for Int32/Uint32 arrays.

runtime/vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 546 matching lines @@
   M(UnboxInt32)                                                                \
   M(UnboxedIntConverter)                                                       \
 
 
 #define FORWARD_DECLARATION(type) class type##Instr;
 FOR_EACH_INSTRUCTION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 
 // Functions required in all concrete instruction classes.
-#define DECLARE_INSTRUCTION(type)                                              \
+#define DECLARE_INSTRUCTION_NO_BACKEND(type)                                   \
   virtual Tag tag() const { return k##type; }                                  \
   virtual void Accept(FlowGraphVisitor* visitor);                              \
   virtual type##Instr* As##type() { return this; }                             \
   virtual const char* DebugName() const { return #type; }                      \
+
+#define DECLARE_INSTRUCTION_BACKEND(type)                                      \
   virtual LocationSummary* MakeLocationSummary(Isolate* isolate,               \
                                                bool optimizing) const;         \
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);                    \
 
+// Functions required in all concrete instruction classes.
+#define DECLARE_INSTRUCTION(type)                                              \
+  DECLARE_INSTRUCTION_NO_BACKEND(type)                                         \
+  DECLARE_INSTRUCTION_BACKEND(type)                                            \
 
 class Instruction : public ZoneAllocated {
  public:
 #define DECLARE_TAG(type) k##type,
   enum Tag {
     FOR_EACH_INSTRUCTION(DECLARE_TAG)
   };
 #undef DECLARE_TAG
 
   Instruction()
@@ skipping 7370 matching lines @@
  private:
   const Token::Kind op_kind_;
 
   DISALLOW_COPY_AND_ASSIGN(UnaryUint32OpInstr);
 };
 
 
 class BoxIntNInstr : public TemplateDefinition<1> {
  public:
   BoxIntNInstr(Representation representation, Value* value)
-      : representation_(representation) {
+      : from_representation_(representation) {
     SetInputAt(0, value);
   }
 
+  Representation from_representation() const { return from_representation_; }
+
   Value* value() const { return inputs_[0]; }
   virtual bool ValueFitsSmi() const;
 
   virtual CompileType ComputeType() const;
   virtual bool RecomputeType();
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual intptr_t DeoptimizationTarget() const {
     return Isolate::kNoDeoptId;
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT(idx == 0);
-    return representation_;
+    return from_representation_;
   }
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const {
-    return other->AsBoxIntN()->representation_ == representation_;
+    return other->AsBoxIntN()->from_representation_ == from_representation_;
   }
 
   virtual bool MayThrow() const { return false; }
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   virtual BoxIntNInstr* AsBoxIntN() { return this; }
 
+  DECLARE_INSTRUCTION_BACKEND(BoxIntN)
+
  private:
-  const Representation representation_;
+  const Representation from_representation_;
 
   DISALLOW_COPY_AND_ASSIGN(BoxIntNInstr);
 };
 
 
 class BoxUint32Instr : public BoxIntNInstr {
  public:
   explicit BoxUint32Instr(Value* value)
       : BoxIntNInstr(kUnboxedUint32, value) { }
 
-  DECLARE_INSTRUCTION(BoxUint32)
+  DECLARE_INSTRUCTION_NO_BACKEND(BoxUint32)
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BoxUint32Instr);
 };
 
 
 class BoxInt32Instr : public BoxIntNInstr {
  public:
   explicit BoxInt32Instr(Value* value)
       : BoxIntNInstr(kUnboxedInt32, value) { }
 
   virtual void InferRange(RangeAnalysis* analysis, Range* range);
 
-  DECLARE_INSTRUCTION(BoxInt32)
+  DECLARE_INSTRUCTION_NO_BACKEND(BoxInt32)
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BoxInt32Instr);
 };
 
 
 class UnboxIntNInstr : public TemplateDefinition<1> {
  public:
   UnboxIntNInstr(Representation representation,
                  Value* value,
                  intptr_t deopt_id)
-      : representation_(representation) {
+      : representation_(representation),
+        is_truncating_(representation == kUnboxedUint32) {
     SetInputAt(0, value);
     deopt_id_ = deopt_id;
   }
 
   Value* value() const { return inputs_[0]; }
 
+  bool is_truncating() const { return is_truncating_; }
+  void mark_truncating() { is_truncating_ = true; }
+
   virtual Representation representation() const {
     return representation_;
   }
 
   virtual CompileType ComputeType() const;
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const {
-    return other->AsUnboxIntN()->representation_ == representation_;
+    UnboxIntNInstr* other_unbox = other->AsUnboxIntN();
+    return (other_unbox->representation_ == representation_) &&
+        (other_unbox->is_truncating_ == is_truncating_);
   }
 
   virtual bool MayThrow() const { return false; }
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   virtual UnboxIntNInstr* AsUnboxIntN() { return this; }
 
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
+  DECLARE_INSTRUCTION_BACKEND(UnboxIntNInstr);
+
  private:
   const Representation representation_;
+  bool is_truncating_;
 
   DISALLOW_COPY_AND_ASSIGN(UnboxIntNInstr);
 };
 
 
 class UnboxUint32Instr : public UnboxIntNInstr {
  public:
   UnboxUint32Instr(Value* value, intptr_t deopt_id)
       : UnboxIntNInstr(kUnboxedUint32, value, deopt_id) {
+    ASSERT(is_truncating());
   }
 
   virtual bool CanDeoptimize() const {
     return (value()->Type()->ToCid() != kSmiCid)
         && (value()->Type()->ToCid() != kMintCid);
   }
 
-  DECLARE_INSTRUCTION(UnboxUint32)
+  DECLARE_INSTRUCTION_NO_BACKEND(UnboxUint32)
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UnboxUint32Instr);
 };
 
 
 class UnboxInt32Instr : public UnboxIntNInstr {
  public:
   UnboxInt32Instr(Value* value, intptr_t deopt_id)
       : UnboxIntNInstr(kUnboxedInt32, value, deopt_id) {
   }
 
   virtual bool CanDeoptimize() const;
 
   virtual void InferRange(RangeAnalysis* analysis, Range* range);
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
-  DECLARE_INSTRUCTION(UnboxInt32)
+  DECLARE_INSTRUCTION_NO_BACKEND(UnboxInt32)
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UnboxInt32Instr);
 };
 
 
 class UnboxedIntConverterInstr : public TemplateDefinition<1> {
  public:
   UnboxedIntConverterInstr(Representation from,
                            Representation to,
                            Value* value,
                            intptr_t deopt_id)
       : from_representation_(from),
-        to_representation_(to) {
+        to_representation_(to),
+        is_truncating_(to == kUnboxedUint32) {
     ASSERT(from != to);
     ASSERT((from == kUnboxedMint) ||
            (from == kUnboxedUint32) ||
            (from == kUnboxedInt32));
     ASSERT((to == kUnboxedMint) ||
            (to == kUnboxedUint32) ||
            (to == kUnboxedInt32));
     ASSERT((to != kUnboxedInt32) || (deopt_id != Isolate::kNoDeoptId));
     SetInputAt(0, value);
     deopt_id_ = deopt_id;
   }
 
   Value* value() const { return inputs_[0]; }
 
   Representation from() const { return from_representation_; }
   Representation to() const { return to_representation_; }
+  bool is_truncating() const { return is_truncating_; }
+
+  void mark_truncating() { is_truncating_ = true; }
 
   Definition* Canonicalize(FlowGraph* flow_graph);
 
   virtual bool CanDeoptimize() const;
 
   virtual Representation representation() const {
     return to();
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT(idx == 0);
     return from();
   }
 
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const {
     ASSERT(other->IsUnboxedIntConverter());
     UnboxedIntConverterInstr* converter = other->AsUnboxedIntConverter();
-    return (converter->from() == from()) && (converter->to() == to());
+    return (converter->from() == from()) &&
+        (converter->to() == to()) &&
+        (converter->is_truncating() == is_truncating());
   }
 
   virtual bool MayThrow() const { return false; }
 
   virtual void InferRange(RangeAnalysis* analysis, Range* range);
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_INSTRUCTION(UnboxedIntConverter);
 
  private:
   const Representation from_representation_;
   const Representation to_representation_;
+  bool is_truncating_;
+
   DISALLOW_COPY_AND_ASSIGN(UnboxedIntConverterInstr);
 };
 
 
 #undef DECLARE_INSTRUCTION
 
 class Environment : public ZoneAllocated {
  public:
   // Iterate the non-NULL values in the innermost level of an environment.
   class ShallowIterator : public ValueObject {
@@ skipping 224 matching lines @@
       Isolate* isolate, bool opt) const {                                     \
     UNIMPLEMENTED();                                                          \
     return NULL;                                                              \
   }                                                                           \
   void Name::EmitNativeCode(FlowGraphCompiler* compiler) { UNIMPLEMENTED(); }
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_