| Index: runtime/vm/intermediate_language.cc
|
| diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
|
| index e70d96b97d5264a49ef9d0aad6bfc2444e503b57..8754ecfe48fe31b2a08e3ff188e891276f82b49b 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_.StaticValue() != Object::sentinel().raw()) &&
|
| + (field_.StaticValue() != Object::transition_sentinel().raw());
|
| return is_initialized ? NULL : this;
|
| }
|
|
|
| @@ -398,8 +398,8 @@ 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().StaticValue() != Object::sentinel().raw());
|
| + ASSERT(StaticField().StaticValue() != Object::transition_sentinel().raw());
|
| return StaticField().raw() == other_load->StaticField().raw();
|
| }
|
|
|
|
|