| Index: runtime/vm/intermediate_language_arm64.cc
|
| diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/intermediate_language_arm64.cc
|
| index 264dec03df0c6413c3decebd5cb9eaa9a6f48090..fe32ee0ee769fc951a981541a9492210920720a8 100644
|
| --- a/runtime/vm/intermediate_language_arm64.cc
|
| +++ b/runtime/vm/intermediate_language_arm64.cc
|
| @@ -3106,7 +3106,7 @@ void UnboxDoubleInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ SmiUntag(TMP, value); // Untag input before conversion.
|
| __ scvtfdx(result, TMP);
|
| } else {
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id_,
|
| + Label* deopt = compiler->AddDeoptStub(GetDeoptId(),
|
| ICData::kDeoptBinaryDoubleOp);
|
| if (value_type->is_nullable() &&
|
| (value_type->ToNullableCid() == kDoubleCid)) {
|
| @@ -3173,7 +3173,8 @@ void UnboxFloat32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const VRegister result = locs()->out(0).fpu_reg();
|
|
|
| if (value_cid != kFloat32x4Cid) {
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id_, ICData::kDeoptCheckClass);
|
| + Label* deopt =
|
| + compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptCheckClass);
|
| __ tsti(value, Immediate(kSmiTagMask));
|
| __ b(deopt, EQ);
|
| __ CompareClassId(value, kFloat32x4Cid, PP);
|
| @@ -3226,7 +3227,8 @@ void UnboxFloat64x2Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const VRegister result = locs()->out(0).fpu_reg();
|
|
|
| if (value_cid != kFloat64x2Cid) {
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id_, ICData::kDeoptCheckClass);
|
| + Label* deopt =
|
| + compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptCheckClass);
|
| __ tsti(value, Immediate(kSmiTagMask));
|
| __ b(deopt, EQ);
|
| __ CompareClassId(value, kFloat64x2Cid, PP);
|
| @@ -3278,7 +3280,8 @@ void UnboxInt32x4Instr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const VRegister result = locs()->out(0).fpu_reg();
|
|
|
| if (value_cid != kInt32x4Cid) {
|
| - Label* deopt = compiler->AddDeoptStub(deopt_id_, ICData::kDeoptCheckClass);
|
| + Label* deopt =
|
| + compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptCheckClass);
|
| __ tsti(value, Immediate(kSmiTagMask));
|
| __ b(deopt, EQ);
|
| __ CompareClassId(value, kInt32x4Cid, PP);
|
| @@ -5287,7 +5290,7 @@ void UnboxIntNInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register out = locs()->out(0).reg();
|
| const Register value = locs()->in(0).reg();
|
| Label* deopt = CanDeoptimize() ?
|
| - compiler->AddDeoptStub(deopt_id_, ICData::kDeoptUnboxInteger) : NULL;
|
| + compiler->AddDeoptStub(GetDeoptId(), ICData::kDeoptUnboxInteger) : NULL;
|
|
|
| if (value_cid == kSmiCid) {
|
| __ SmiUntag(out, value);
|
|
|