| Index: runtime/vm/intermediate_language_mips.cc
|
| diff --git a/runtime/vm/intermediate_language_mips.cc b/runtime/vm/intermediate_language_mips.cc
|
| index e888e8454a8eefbd3ed6f6e8e3ca2084ed6ec7bb..6cb930f1b0e346deffecf176ec0d457f23ed5422 100644
|
| --- a/runtime/vm/intermediate_language_mips.cc
|
| +++ b/runtime/vm/intermediate_language_mips.cc
|
| @@ -2092,7 +2092,9 @@ void LoadStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| __ Comment("LoadStaticFieldInstr");
|
| Register field = locs()->in(0).reg();
|
| Register result = locs()->out(0).reg();
|
| - __ LoadFromOffset(result, field, Field::value_offset() - kHeapObjectTag);
|
| + __ LoadFromOffset(result,
|
| + field,
|
| + Field::static_value_offset() - kHeapObjectTag);
|
| }
|
|
|
|
|
| @@ -2115,10 +2117,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);
|
| }
|
| }
|
|
|
| @@ -2592,7 +2596,7 @@ void InitStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Label call_runtime, no_call;
|
| __ Comment("InitStaticFieldInstr");
|
|
|
| - __ lw(temp, FieldAddress(field, Field::value_offset()));
|
| + __ lw(temp, FieldAddress(field, Field::static_value_offset()));
|
| __ BranchEqual(temp, Object::sentinel(), &call_runtime);
|
| __ BranchNotEqual(temp, Object::transition_sentinel(), &no_call);
|
|
|
|
|