| Index: runtime/vm/assembler_x64.cc | 
| diff --git a/runtime/vm/assembler_x64.cc b/runtime/vm/assembler_x64.cc | 
| index 0d854e76772fe007d076bdba3592d8d9e71d9ba2..594f04d8e563bb963c2f414bd375e0be49daa726 100644 | 
| --- a/runtime/vm/assembler_x64.cc | 
| +++ b/runtime/vm/assembler_x64.cc | 
| @@ -3433,12 +3433,10 @@ void Assembler::TryAllocate(const Class& cls, | 
| NOT_IN_PRODUCT(UpdateAllocationStats(cls.id(), space)); | 
| ASSERT(instance_size >= kHeapObjectTag); | 
| AddImmediate(instance_reg, Immediate(kHeapObjectTag - instance_size)); | 
| -    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. | 
| MoveImmediate(FieldAddress(instance_reg, Object::tags_offset()), | 
| Immediate(tags)); | 
| } else { | 
| @@ -3482,11 +3480,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. | 
| movq(FieldAddress(instance, Array::tags_offset()), Immediate(tags)); | 
| } else { | 
| jmp(failure); | 
|  |