Index: runtime/vm/intermediate_language_ia32.cc |
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc |
index af1185c1f9feff7b4bd3482040ca013b8d8cb297..35bc94207177a865a41d0353d22f3282a5155bf6 100644 |
--- a/runtime/vm/intermediate_language_ia32.cc |
+++ b/runtime/vm/intermediate_language_ia32.cc |
@@ -1971,7 +1971,7 @@ LocationSummary* LoadStaticFieldInstr::MakeLocationSummary(Zone* zone, |
void LoadStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Register field = locs()->in(0).reg(); |
Register result = locs()->out(0).reg(); |
- __ movl(result, FieldAddress(field, Field::value_offset())); |
+ __ movl(result, FieldAddress(field, Field::static_value_offset())); |
} |
@@ -1993,10 +1993,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); |
} |
} |
@@ -2493,7 +2495,7 @@ void InitStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
Label call_runtime, no_call; |
- __ movl(temp, FieldAddress(field, Field::value_offset())); |
+ __ movl(temp, FieldAddress(field, Field::static_value_offset())); |
__ CompareObject(temp, Object::sentinel()); |
__ j(EQUAL, &call_runtime); |