| Index: runtime/vm/intermediate_language.cc
|
| diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
|
| index 4b38ab367a5b8425dc23a994ef7c5fc2643aad81..52d5ce9dca8a6fe2dbc8f77216ca204cfdb9aec1 100644
|
| --- a/runtime/vm/intermediate_language.cc
|
| +++ b/runtime/vm/intermediate_language.cc
|
| @@ -398,7 +398,8 @@ Instruction* InitStaticFieldInstr::Canonicalize(FlowGraph* flow_graph) {
|
|
|
|
|
| EffectSet LoadStaticFieldInstr::Dependencies() const {
|
| - return StaticField().is_final() ? EffectSet::None() : EffectSet::All();
|
| + return (StaticField().is_final() && !FLAG_fields_may_be_reset)
|
| + ? EffectSet::None() : EffectSet::All();
|
| }
|
|
|
|
|
|
|