Index: runtime/vm/intermediate_language_arm64.cc |
diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/intermediate_language_arm64.cc |
index 785d8f7e74662bd61a5824ab4f788a08f2b4bdf2..cc56957a9d4704ba089c3560d6263961867d35d8 100644 |
--- a/runtime/vm/intermediate_language_arm64.cc |
+++ b/runtime/vm/intermediate_language_arm64.cc |
@@ -1968,7 +1968,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(result, field, Field::value_offset()); |
+ __ LoadFieldFromOffset(result, field, Field::static_value_offset()); |
} |
@@ -1990,9 +1990,11 @@ void StoreStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
__ LoadObject(temp, field()); |
if (this->value()->NeedsStoreBuffer()) { |
__ StoreIntoObjectOffset( |
- temp, Field::value_offset(), value, CanValueBeSmi()); |
+ temp, Field::static_value_offset(), value, CanValueBeSmi()); |
} else { |
- __ StoreIntoObjectOffsetNoBarrier(temp, Field::value_offset(), value); |
+ __ StoreIntoObjectOffsetNoBarrier(temp, |
+ Field::static_value_offset(), |
+ value); |
} |
} |
@@ -2489,7 +2491,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); |