| Index: runtime/vm/intermediate_language_arm.cc
|
| diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
|
| index c81656105336ab8e166d9013cf971a72162bcfdb..a3495973b26f21cc1c7fda0815ef86e083126880 100644
|
| --- a/runtime/vm/intermediate_language_arm.cc
|
| +++ b/runtime/vm/intermediate_language_arm.cc
|
| @@ -2244,7 +2244,7 @@ LocationSummary* LoadStaticFieldInstr::MakeLocationSummary(Zone* zone,
|
| void LoadStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register field = locs()->in(0).reg();
|
| const Register result = locs()->out(0).reg();
|
| - __ LoadFieldFromOffset(kWord, result, field, Field::value_offset());
|
| + __ LoadFieldFromOffset(kWord, result, field, Field::static_value_offset());
|
| }
|
|
|
|
|
| @@ -2266,10 +2266,12 @@ void StoreStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ LoadObject(temp, field());
|
| if (this->value()->NeedsStoreBuffer()) {
|
| __ StoreIntoObject(temp,
|
| - FieldAddress(temp, Field::value_offset()), value, CanValueBeSmi());
|
| + FieldAddress(temp, Field::static_value_offset()),
|
| + value,
|
| + CanValueBeSmi());
|
| } else {
|
| __ StoreIntoObjectNoBarrier(
|
| - temp, FieldAddress(temp, Field::value_offset()), value);
|
| + temp, FieldAddress(temp, Field::static_value_offset()), value);
|
| }
|
| }
|
|
|
| @@ -2775,7 +2777,7 @@ void InitStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Register temp = locs()->temp(0).reg();
|
| Label call_runtime, no_call;
|
|
|
| - __ ldr(temp, FieldAddress(field, Field::value_offset()));
|
| + __ ldr(temp, FieldAddress(field, Field::static_value_offset()));
|
| __ CompareObject(temp, Object::sentinel());
|
| __ b(&call_runtime, EQ);
|
|
|
|
|