Index: runtime/vm/intermediate_language_x64.cc |
diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc |
index 252bb138cd3571a941b4a25154c871d39713280b..88673f62bbcc9e5b08974c1317d36dced89dc8c2 100644 |
--- a/runtime/vm/intermediate_language_x64.cc |
+++ b/runtime/vm/intermediate_language_x64.cc |
@@ -1973,7 +1973,7 @@ LocationSummary* LoadStaticFieldInstr::MakeLocationSummary(Zone* zone, |
void LoadStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Register field = locs()->in(0).reg(); |
Register result = locs()->out(0).reg(); |
- __ movq(result, FieldAddress(field, Field::value_offset())); |
+ __ movq(result, FieldAddress(field, Field::static_value_offset())); |
} |
@@ -1995,10 +1995,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); |
} |
} |
@@ -2489,7 +2491,7 @@ void InitStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Label call_runtime, no_call; |
- __ movq(temp, FieldAddress(field, Field::value_offset())); |
+ __ movq(temp, FieldAddress(field, Field::static_value_offset())); |
__ CompareObject(temp, Object::sentinel()); |
__ j(EQUAL, &call_runtime); |