| Index: runtime/vm/assembler_arm64.cc
|
| diff --git a/runtime/vm/assembler_arm64.cc b/runtime/vm/assembler_arm64.cc
|
| index 1d12ee89d2411e2c85f2446018e181ee8e8474bd..efe2f1ca6afe96e9d5ded5cdad681692e26ec957 100644
|
| --- a/runtime/vm/assembler_arm64.cc
|
| +++ b/runtime/vm/assembler_arm64.cc
|
| @@ -1363,12 +1363,10 @@ void Assembler::TryAllocate(const Class& cls,
|
| AddImmediate(instance_reg, -instance_size + kHeapObjectTag);
|
| NOT_IN_PRODUCT(UpdateAllocationStats(cls.id(), space));
|
|
|
| - uint32_t tags = 0;
|
| + uword tags = 0;
|
| tags = RawObject::SizeTag::update(instance_size, tags);
|
| ASSERT(cls.id() != kIllegalCid);
|
| tags = RawObject::ClassIdTag::update(cls.id(), tags);
|
| - // Extends the 32 bit tags with zeros, which is the uninitialized
|
| - // hash code.
|
| LoadImmediate(TMP, tags);
|
| StoreFieldToOffset(TMP, instance_reg, Object::tags_offset());
|
| } else {
|
| @@ -1412,11 +1410,9 @@ void Assembler::TryAllocateArray(intptr_t cid,
|
|
|
| // Initialize the tags.
|
| // instance: new object start as a tagged pointer.
|
| - uint32_t tags = 0;
|
| + uword tags = 0;
|
| tags = RawObject::ClassIdTag::update(cid, tags);
|
| tags = RawObject::SizeTag::update(instance_size, tags);
|
| - // Extends the 32 bit tags with zeros, which is the uninitialized
|
| - // hash code.
|
| LoadImmediate(temp2, tags);
|
| str(temp2, FieldAddress(instance, Array::tags_offset())); // Store tags.
|
| } else {
|
|
|