Fix bug with optimized try-catch and unboxed values.

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/bigint_operations.h"
 #include "vm/bit_vector.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
@@ skipping 1616 matching lines @@
                             StubCode::DebugStepCheckEntryPoint());
   compiler->GenerateCall(token_pos(), &label, stub_kind_, locs());
 }
 
 
 Instruction* DebugStepCheckInstr::Canonicalize(FlowGraph* flow_graph) {
   return NULL;
 }
 
 
+static bool HasTryBlockUse(Value* use_list) {
+  for (Value::Iterator it(use_list); !it.Done(); it.Advance()) {
+    Value* use = it.Current();
+    if (use->instruction()->MayThrow() &&
+        use->instruction()->GetBlock()->InsideTryBlock()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+
 Definition* BoxDoubleInstr::Canonicalize(FlowGraph* flow_graph) {
-  if (input_use_list() == NULL) {
+  if ((input_use_list() == NULL) && !HasTryBlockUse(env_use_list())) {
     // Environments can accomodate any representation. No need to box.
     return value()->definition();
   }
 
   // Fold away BoxDouble(UnboxDouble(v)) if value is known to be double.
   UnboxDoubleInstr* defn = value()->definition()->AsUnboxDouble();
   if ((defn != NULL) && (defn->value()->Type()->ToCid() == kDoubleCid)) {
     return defn->value()->definition();
   }
 
@@ skipping 14 matching lines @@
     UnboxedConstantInstr* uc = new UnboxedConstantInstr(c->value());
     flow_graph->InsertBefore(this, uc, NULL, Definition::kValue);
     return uc;
   }
 
   return this;
 }
 
 
 Definition* BoxFloat32x4Instr::Canonicalize(FlowGraph* flow_graph) {
-  if (input_use_list() == NULL) {
+  if ((input_use_list() == NULL) && !HasTryBlockUse(env_use_list())) {
     // Environments can accomodate any representation. No need to box.
     return value()->definition();
   }
 
   // Fold away BoxFloat32x4(UnboxFloat32x4(v)).
   UnboxFloat32x4Instr* defn = value()->definition()->AsUnboxFloat32x4();
   if ((defn != NULL) && (defn->value()->Type()->ToCid() == kFloat32x4Cid)) {
     return defn->value()->definition();
   }
 
   return this;
 }
 
 
 Definition* UnboxFloat32x4Instr::Canonicalize(FlowGraph* flow_graph) {
   // Fold away UnboxFloat32x4(BoxFloat32x4(v)).
   BoxFloat32x4Instr* defn = value()->definition()->AsBoxFloat32x4();
   return (defn != NULL) ? defn->value()->definition() : this;
 }
 
 
 Definition* BoxFloat64x2Instr::Canonicalize(FlowGraph* flow_graph) {
-  if (input_use_list() == NULL) {
+  if ((input_use_list() == NULL) && !HasTryBlockUse(env_use_list())) {
     // Environments can accomodate any representation. No need to box.
     return value()->definition();
   }
 
   // Fold away BoxFloat64x2(UnboxFloat64x2(v)).
   UnboxFloat64x2Instr* defn = value()->definition()->AsUnboxFloat64x2();
   if ((defn != NULL) && (defn->value()->Type()->ToCid() == kFloat64x2Cid)) {
     return defn->value()->definition();
   }
 
   return this;
 }
 
 
 Definition* UnboxFloat64x2Instr::Canonicalize(FlowGraph* flow_graph) {
   // Fold away UnboxFloat64x2(BoxFloat64x2(v)).
   BoxFloat64x2Instr* defn = value()->definition()->AsBoxFloat64x2();
   return (defn != NULL) ? defn->value()->definition() : this;
 }
 
 
 
 Definition* BoxInt32x4Instr::Canonicalize(FlowGraph* flow_graph) {
-  if (input_use_list() == NULL) {
+  if ((input_use_list() == NULL) && !HasTryBlockUse(env_use_list())) {
     // Environments can accomodate any representation. No need to box.
     return value()->definition();
   }
 
   // Fold away BoxInt32x4(UnboxInt32x4(v)).
   UnboxInt32x4Instr* defn = value()->definition()->AsUnboxInt32x4();
   if ((defn != NULL) && (defn->value()->Type()->ToCid() == kInt32x4Cid)) {
     return defn->value()->definition();
   }
 
@@ skipping 1693 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart