Index: runtime/vm/flow_graph_builder.cc |
diff --git a/runtime/vm/flow_graph_builder.cc b/runtime/vm/flow_graph_builder.cc |
index 23015f4b0140c9767ea4b27208ff09f7d2e4677b..c5460be9ff01b152ae9b246658cd9b9bb40edf5c 100644 |
--- a/runtime/vm/flow_graph_builder.cc |
+++ b/runtime/vm/flow_graph_builder.cc |
@@ -2770,7 +2770,8 @@ void ValueGraphVisitor::VisitClosureCallNode(ClosureCallNode* node) { |
void EffectGraphVisitor::VisitInitStaticFieldNode(InitStaticFieldNode* node) { |
- Value* field = Bind(new(Z) ConstantInstr(node->field())); |
+ Value* field = Bind(new(Z) ConstantInstr( |
+ Field::ZoneHandle(Z, node->field().Original()))); |
AddInstruction(new(Z) InitStaticFieldInstr(field, node->field())); |
} |
@@ -3733,7 +3734,8 @@ void EffectGraphVisitor::VisitLoadStaticFieldNode(LoadStaticFieldNode* node) { |
Instance::ZoneHandle(Z, node->field().StaticValue()), token_pos); |
return ReturnDefinition(result); |
} |
- Value* field_value = Bind(new(Z) ConstantInstr(node->field(), token_pos)); |
+ Value* field_value = Bind(new(Z) ConstantInstr( |
+ Field::ZoneHandle(Z, node->field().Original()), token_pos)); |
LoadStaticFieldInstr* load = |
new(Z) LoadStaticFieldInstr(field_value, token_pos); |
ReturnDefinition(load); |