| Index: runtime/vm/intermediate_language.cc
|
| diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
|
| index b7bacba5eda7e0c6eb1edf8f2b84d5ad58a7ed71..8927233a2a96ecb4349ada310674e70368f1509c 100644
|
| --- a/runtime/vm/intermediate_language.cc
|
| +++ b/runtime/vm/intermediate_language.cc
|
| @@ -383,8 +383,8 @@ bool LoadFieldInstr::AttributesEqual(Instruction* other) const {
|
|
|
| Instruction* InitStaticFieldInstr::Canonicalize(FlowGraph* flow_graph) {
|
| const bool is_initialized =
|
| - (field_.value() != Object::sentinel().raw()) &&
|
| - (field_.value() != Object::transition_sentinel().raw());
|
| + (field_.StaticFieldValue() != Object::sentinel().raw()) &&
|
| + (field_.StaticFieldValue() != Object::transition_sentinel().raw());
|
| return is_initialized ? NULL : this;
|
| }
|
|
|
| @@ -398,8 +398,9 @@ bool LoadStaticFieldInstr::AttributesEqual(Instruction* other) const {
|
| LoadStaticFieldInstr* other_load = other->AsLoadStaticField();
|
| ASSERT(other_load != NULL);
|
| // Assert that the field is initialized.
|
| - ASSERT(StaticField().value() != Object::sentinel().raw());
|
| - ASSERT(StaticField().value() != Object::transition_sentinel().raw());
|
| + ASSERT(StaticField().StaticFieldValue() != Object::sentinel().raw());
|
| + ASSERT(StaticField().StaticFieldValue() !=
|
| + Object::transition_sentinel().raw());
|
| return StaticField().raw() == other_load->StaticField().raw();
|
| }
|
|
|
|
|