| Index: runtime/vm/intermediate_language_arm.cc
|
| diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
|
| index c7591b5edb5d7eaa63a122f01b888350a7d64c78..2c7d44ed9e6a507333572190d03199173b24b63e 100644
|
| --- a/runtime/vm/intermediate_language_arm.cc
|
| +++ b/runtime/vm/intermediate_language_arm.cc
|
| @@ -1075,7 +1075,14 @@ LocationSummary* LoadClassIdInstr::MakeLocationSummary(Zone* zone,
|
| void LoadClassIdInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register object = locs()->in(0).reg();
|
| const Register result = locs()->out(0).reg();
|
| - __ LoadTaggedClassIdMayBeSmi(result, object);
|
| + const AbstractType& value_type = *this->object()->Type()->ToAbstractType();
|
| + if (CompileType::Smi().IsAssignableTo(value_type) ||
|
| + value_type.IsTypeParameter()) {
|
| + __ LoadTaggedClassIdMayBeSmi(result, object);
|
| + } else {
|
| + __ LoadClassId(result, object);
|
| + __ SmiTag(result);
|
| + }
|
| }
|
|
|
|
|
|
|