| Index: runtime/vm/constant_propagator.cc
|
| diff --git a/runtime/vm/constant_propagator.cc b/runtime/vm/constant_propagator.cc
|
| index 40363cbd1f2fd90f6ed87586cdaf79fa6c69d0e8..51d19f377cf6a3086ae497a4dfb3bd9d2922982c 100644
|
| --- a/runtime/vm/constant_propagator.cc
|
| +++ b/runtime/vm/constant_propagator.cc
|
| @@ -681,12 +681,12 @@ void ConstantPropagator::VisitInstanceOf(InstanceOfInstr* instr) {
|
| (checked_type.IsInt32x4Type() && (rep == kUnboxedInt32x4)) ||
|
| (checked_type.IsDoubleType() && (rep == kUnboxedDouble) &&
|
| FlowGraphCompiler::SupportsUnboxedDoubles()) ||
|
| - (checked_type.IsIntType() && (rep == kUnboxedMint))) {
|
| + (checked_type.IsIntType() && (rep == kUnboxedInt64))) {
|
| // Ensure that compile time type matches representation.
|
| ASSERT(((rep == kUnboxedFloat32x4) && (value_cid == kFloat32x4Cid)) ||
|
| ((rep == kUnboxedInt32x4) && (value_cid == kInt32x4Cid)) ||
|
| ((rep == kUnboxedDouble) && (value_cid == kDoubleCid)) ||
|
| - ((rep == kUnboxedMint) && (value_cid == kMintCid)));
|
| + ((rep == kUnboxedInt64) && (value_cid == kMintCid)));
|
| // The representation guarantees the type check to be true.
|
| SetValue(instr, Bool::True());
|
| } else {
|
| @@ -906,11 +906,11 @@ void ConstantPropagator::VisitShiftUint32Op(ShiftUint32OpInstr* instr) {
|
| VisitBinaryIntegerOp(instr);
|
| }
|
|
|
| -void ConstantPropagator::VisitBinaryMintOp(BinaryMintOpInstr* instr) {
|
| +void ConstantPropagator::VisitBinaryInt64Op(BinaryInt64OpInstr* instr) {
|
| VisitBinaryIntegerOp(instr);
|
| }
|
|
|
| -void ConstantPropagator::VisitShiftMintOp(ShiftMintOpInstr* instr) {
|
| +void ConstantPropagator::VisitShiftInt64Op(ShiftInt64OpInstr* instr) {
|
| VisitBinaryIntegerOp(instr);
|
| }
|
|
|
| @@ -938,7 +938,7 @@ void ConstantPropagator::VisitUnaryIntegerOp(UnaryIntegerOpInstr* unary_op) {
|
| SetValue(unary_op, non_constant_);
|
| }
|
|
|
| -void ConstantPropagator::VisitUnaryMintOp(UnaryMintOpInstr* instr) {
|
| +void ConstantPropagator::VisitUnaryInt64Op(UnaryInt64OpInstr* instr) {
|
| VisitUnaryIntegerOp(instr);
|
| }
|
|
|
|
|