Index: runtime/vm/flow_graph_optimizer.cc |
=================================================================== |
--- runtime/vm/flow_graph_optimizer.cc (revision 23823) |
+++ runtime/vm/flow_graph_optimizer.cc (working copy) |
@@ -5436,7 +5436,8 @@ |
case Token::kMOD: { |
Instance& result = Integer::ZoneHandle( |
left_int.ArithmeticOp(op_kind, right_int)); |
- result = result.Canonicalize(); |
+ result = result.CheckAndCanonicalize(NULL); |
+ ASSERT(!result.IsNull()); |
SetValue(instr, result); |
break; |
} |
@@ -5445,7 +5446,8 @@ |
if (left.IsSmi() && right.IsSmi()) { |
Instance& result = Integer::ZoneHandle( |
Smi::Cast(left_int).ShiftOp(op_kind, Smi::Cast(right_int))); |
- result = result.Canonicalize(); |
+ result = result.CheckAndCanonicalize(NULL); |
+ ASSERT(!result.IsNull()); |
SetValue(instr, result); |
} else { |
SetValue(instr, non_constant_); |
@@ -5456,7 +5458,8 @@ |
case Token::kBIT_XOR: { |
Instance& result = Integer::ZoneHandle( |
left_int.BitOp(op_kind, right_int)); |
- result = result.Canonicalize(); |
+ result = result.CheckAndCanonicalize(NULL); |
+ ASSERT(!result.IsNull()); |
SetValue(instr, result); |
break; |
} |