Chromium Code Reviews| Index: runtime/vm/assembler_arm64.cc |
| diff --git a/runtime/vm/assembler_arm64.cc b/runtime/vm/assembler_arm64.cc |
| index 2d800fc5c8b6835068470d53f3936e708573ae85..223f0fbb8c95f2cf31b9bb13328f58f58bb3f581 100644 |
| --- a/runtime/vm/assembler_arm64.cc |
| +++ b/runtime/vm/assembler_arm64.cc |
| @@ -985,12 +985,12 @@ void Assembler::StoreIntoObjectOffsetNoBarrier(Register object, |
| void Assembler::LoadClassId(Register result, Register object, Register pp) { |
| - ASSERT(RawObject::kClassIdTagPos == 16); |
| - ASSERT(RawObject::kClassIdTagSize == 16); |
| + ASSERT(RawObject::kClassIdTagPos == 32); |
| + ASSERT(RawObject::kClassIdTagSize == 32); |
|
siva
2015/06/12 22:08:11
Use kBitsPerInt32 instead of 32.
and in the place
rmacnak
2015/06/12 23:27:22
Done.
|
| const intptr_t class_id_offset = Object::tags_offset() + |
| RawObject::kClassIdTagPos / kBitsPerByte; |
| LoadFromOffset(result, object, class_id_offset - kHeapObjectTag, pp, |
| - kUnsignedHalfword); |
| + kUnsignedWord); |
| } |