| Index: runtime/vm/intermediate_language_ia32.cc
|
| diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc
|
| index e82eeef37fc52e1297bedf8eac02c573e0a7babc..bebb56142723f09efbe7505f46877e6ebd60ce5e 100644
|
| --- a/runtime/vm/intermediate_language_ia32.cc
|
| +++ b/runtime/vm/intermediate_language_ia32.cc
|
| @@ -20,6 +20,7 @@
|
| #include "vm/symbols.h"
|
|
|
| #define __ compiler->assembler()->
|
| +#define Z (compiler->zone())
|
|
|
| namespace dart {
|
|
|
| @@ -1441,7 +1442,7 @@ void GuardFieldClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label* fail = (deopt != NULL) ? deopt : &fail_label;
|
|
|
| if (emit_full_guard) {
|
| - __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
|
| + __ LoadObject(field_reg, Field::ZoneHandle(field().Original()));
|
|
|
| FieldAddress field_cid_operand(field_reg, Field::guarded_cid_offset());
|
| FieldAddress field_nullability_operand(
|
| @@ -1589,7 +1590,7 @@ void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
|
|
| Label ok;
|
|
|
| - __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
|
| + __ LoadObject(field_reg, Field::ZoneHandle(field().Original()));
|
|
|
| __ movsxb(offset_reg, FieldAddress(field_reg,
|
| Field::guarded_list_length_in_object_offset_offset()));
|
| @@ -1829,7 +1830,7 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label store_float32x4;
|
| Label store_float64x2;
|
|
|
| - __ LoadObject(temp, Field::ZoneHandle(field().raw()));
|
| + __ LoadObject(temp, Field::ZoneHandle(Z, field().Original()));
|
|
|
| __ cmpw(FieldAddress(temp, Field::is_nullable_offset()),
|
| Immediate(kNullCid));
|
| @@ -1975,7 +1976,7 @@ void StoreStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Register value = locs()->in(0).reg();
|
| Register temp = locs()->temp(0).reg();
|
|
|
| - __ LoadObject(temp, field());
|
| + __ LoadObject(temp, Field::ZoneHandle(Z, field().Original()));
|
| if (this->value()->NeedsStoreBuffer()) {
|
| __ StoreIntoObject(temp,
|
| FieldAddress(temp, Field::static_value_offset()),
|
| @@ -2198,7 +2199,7 @@ void LoadFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label load_float32x4;
|
| Label load_float64x2;
|
|
|
| - __ LoadObject(result, Field::ZoneHandle(field()->raw()));
|
| + __ LoadObject(result, Field::ZoneHandle(field()->Original()));
|
|
|
| FieldAddress field_cid_operand(result, Field::guarded_cid_offset());
|
| FieldAddress field_nullability_operand(result, Field::is_nullable_offset());
|
|
|