| Index: runtime/vm/intermediate_language_dbc.cc | 
| diff --git a/runtime/vm/intermediate_language_dbc.cc b/runtime/vm/intermediate_language_dbc.cc | 
| index 1e060e3a80f01d85d7ae0bcca1a9843d266aced7..00142af0cb1e7ebfc5964a0d64a205d2c04cb0c2 100644 | 
| --- a/runtime/vm/intermediate_language_dbc.cc | 
| +++ b/runtime/vm/intermediate_language_dbc.cc | 
| @@ -1012,7 +1012,7 @@ EMIT_NATIVE_CODE(AllocateObject, | 
| Isolate* isolate = Isolate::Current(); | 
| if (Heap::IsAllocatableInNewSpace(instance_size) && | 
| !cls().TraceAllocation(isolate)) { | 
| -        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); | 
| @@ -1046,7 +1046,6 @@ EMIT_NATIVE_CODE(AllocateObject, | 
| tags = RawObject::SizeTag::update(instance_size, tags); | 
| ASSERT(cls().id() != kIllegalCid); | 
| tags = RawObject::ClassIdTag::update(cls().id(), tags); | 
| -      // tags also has the initial zero hash code on 64 bit. | 
| if (Smi::IsValid(tags)) { | 
| const intptr_t tags_kidx = __ AddConstant(Smi::Handle(Smi::New(tags))); | 
| __ AllocateOpt(locs()->out(0).reg(), tags_kidx); | 
| @@ -1658,7 +1657,6 @@ EMIT_NATIVE_CODE(Box, 1, Location::RequiresRegister(), LocationSummary::kCall) { | 
| uword tags = 0; | 
| tags = RawObject::SizeTag::update(instance_size, tags); | 
| tags = RawObject::ClassIdTag::update(compiler->double_class().id(), tags); | 
| -    // tags also has the initial zero hash code on 64 bit. | 
| if (Smi::IsValid(tags)) { | 
| const intptr_t tags_kidx = __ AddConstant(Smi::Handle(Smi::New(tags))); | 
| __ AllocateOpt(out, tags_kidx); | 
|  |