Fix StoreIndexedInstr input representation requirements for Int32/Uint32 arrays.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
@@ skipping 1150 matching lines @@
 }
 
 
 void Instruction::Goto(JoinEntryInstr* entry) {
   LinkTo(new GotoInstr(entry));
 }
 
 
 bool UnboxedIntConverterInstr::CanDeoptimize() const {
   return (to() == kUnboxedInt32) &&
+      !is_truncating() &&
       !RangeUtils::Fits(value()->definition()->range(),
                         RangeBoundary::kRangeBoundaryInt32);
 }
 
 
 bool UnboxInt32Instr::CanDeoptimize() const {
   const intptr_t value_cid = value()->Type()->ToCid();
   if (value_cid == kSmiCid) {
-    return false;
+    return (kSmiBits > 32) &&
+        !is_truncating() &&
+        !RangeUtils::Fits(value()->definition()->range(),
+                          RangeBoundary::kRangeBoundaryInt32);
   } else if (value_cid == kMintCid) {
-    return !RangeUtils::Fits(value()->definition()->range(),
-                             RangeBoundary::kRangeBoundaryInt32);
+    return !is_truncating() &&
+        !RangeUtils::Fits(value()->definition()->range(),
+                          RangeBoundary::kRangeBoundaryInt32);
   } else {
     return true;
   }
 }
 
 
 bool BinaryInt32OpInstr::CanDeoptimize() const {
   switch (op_kind()) {
     case Token::kBIT_AND:
     case Token::kBIT_OR:
@@ skipping 543 matching lines @@
   BoxIntNInstr* box_defn = value()->definition()->AsBoxIntN();
   if (box_defn != NULL) {
     if (box_defn->value()->definition()->representation() == representation()) {
       return box_defn->value()->definition();
     } else {
       UnboxedIntConverterInstr* converter = new UnboxedIntConverterInstr(
           box_defn->value()->definition()->representation(),
           representation(),
           box_defn->value()->CopyWithType(),
           representation() == kUnboxedInt32 ? deopt_id_ : Isolate::kNoDeoptId);
+      if ((representation() == kUnboxedInt32) && is_truncating()) {
+        converter->mark_truncating();
+      }
       flow_graph->InsertBefore(this, converter, env(), FlowGraph::kValue);
       return converter;
     }
   }
 
   return this;
 }
 
 
 Definition* UnboxedIntConverterInstr::Canonicalize(FlowGraph* flow_graph) {
   if (!HasUses()) return NULL;
 
   UnboxedIntConverterInstr* box_defn =
       value()->definition()->AsUnboxedIntConverter();
   if ((box_defn != NULL) && (box_defn->representation() == from())) {
     if (box_defn->from() == to()) {
       return box_defn->value()->definition();
     }
 
     UnboxedIntConverterInstr* converter = new UnboxedIntConverterInstr(
         box_defn->from(),
         representation(),
         box_defn->value()->CopyWithType(),
         to() == kUnboxedInt32 ? deopt_id_ : NULL);
+    if ((representation() == kUnboxedInt32) && is_truncating()) {
+      converter->mark_truncating();
+    }
     flow_graph->InsertBefore(this, converter, env(), FlowGraph::kValue);
     return converter;
   }
 
   UnboxIntegerInstr* unbox_defn = value()->definition()->AsUnboxInteger();
   if (unbox_defn != NULL &&
       (from() == kUnboxedMint) &&
       (to() == kUnboxedInt32) &&
       unbox_defn->HasOnlyInputUse(value())) {
     // TODO(vegorov): there is a duplication of code between UnboxedIntCoverter
     // and code path that unboxes Mint into Int32. We should just schedule
     // these instructions close to each other instead of fusing them.
     Definition* replacement =
         new UnboxInt32Instr(unbox_defn->value()->CopyWithType(), deopt_id_);
+    if (is_truncating()) {
+      replacement->AsUnboxInt32()->mark_truncating();
+    }
     flow_graph->InsertBefore(this,
                              replacement,
                              env(),
                              FlowGraph::kValue);
     return replacement;
   }
 
   return this;
 }
 
 
 Definition* UnboxInt32Instr::Canonicalize(FlowGraph* flow_graph) {
   Definition* replacement = UnboxIntNInstr::Canonicalize(flow_graph);
   if (replacement != this) {
     return replacement;
   }
 
   ConstantInstr* c = value()->definition()->AsConstant();
   if ((c != NULL) && c->value().IsSmi()) {
+    if (!is_truncating() && (kSmiBits > 32)) {
+      // Check that constant fits into 32-bit integer.
+      const int64_t value =
+          static_cast<int64_t>(Smi::Cast(c->value()).Value());
+      if (!Utils::IsInt(32, value)) {
+        return this;
+      }
+    }
+
     UnboxedConstantInstr* uc =
         new UnboxedConstantInstr(c->value(), kUnboxedInt32);
     flow_graph->InsertBefore(this, uc, NULL, FlowGraph::kValue);
     return uc;
   }
 
   return this;
 }
 
 
@@ skipping 1279 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart