Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: runtime/vm/constant_propagator.cc

Issue 2761933002: Add Genericity enum in VM to distinguish how a type is uninstantiated. (Closed)
Patch Set: sync Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/aot_optimizer.cc ('k') | runtime/vm/flow_graph_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/constant_propagator.cc
diff --git a/runtime/vm/constant_propagator.cc b/runtime/vm/constant_propagator.cc
index f3827b0ee97043226e98e417ad52aa088f71ceb5..a147466267323efa4505354f13cb7b5e16fd255f 100644
--- a/runtime/vm/constant_propagator.cc
+++ b/runtime/vm/constant_propagator.cc
@@ -859,7 +859,9 @@ void ConstantPropagator::VisitLoadField(LoadFieldInstr* instr) {
void ConstantPropagator::VisitInstantiateType(InstantiateTypeInstr* instr) {
- const Object& object = instr->instantiator()->definition()->constant_value();
+ const Object& object =
+ instr->instantiator_type_arguments()->definition()->constant_value();
+ // TODO(regis): Check function type arguments.
if (IsNonConstant(object)) {
SetValue(instr, non_constant_);
return;
@@ -880,7 +882,9 @@ void ConstantPropagator::VisitInstantiateType(InstantiateTypeInstr* instr) {
void ConstantPropagator::VisitInstantiateTypeArguments(
InstantiateTypeArgumentsInstr* instr) {
- const Object& object = instr->instantiator()->definition()->constant_value();
+ const Object& object =
+ instr->instantiator_type_arguments()->definition()->constant_value();
+ // TODO(regis): Check function type arguments.
if (IsNonConstant(object)) {
SetValue(instr, non_constant_);
return;
« no previous file with comments | « runtime/vm/aot_optimizer.cc ('k') | runtime/vm/flow_graph_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698