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

Unified Diff: runtime/vm/intermediate_language.cc

Issue 2818273002: Remove parent_level field of function type parameters. (Closed)
Patch Set: address comments Created 3 years, 8 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/flow_graph_builder.cc ('k') | runtime/vm/kernel_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language.cc
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index 894d7fa7912055d89f517c2c9b7cee6f83200f47..002d6dfffde83e78819d1c3fb3ab8c2dfdcd63be 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -2064,16 +2064,11 @@ Definition* AssertAssignableInstr::Canonicalize(FlowGraph* flow_graph) {
value()->Type()->IsAssignableTo(dst_type())) {
return value()->definition();
}
-
- // For uninstantiated target types: If the instantiator and function
- // type arguments are constant, instantiate the target type here.
- // If the uninstantiated type refers to parent function type parameters, we
- // cannot instantiated it here.
- if (dst_type().IsInstantiated() ||
- !dst_type().IsInstantiated(kParentFunctions)) {
+ if (dst_type().IsInstantiated()) {
return this;
}
-
+ // For uninstantiated target types: If the instantiator and function
+ // type arguments are constant, instantiate the target type here.
ConstantInstr* constant_instantiator_type_args =
instantiator_type_arguments()->definition()->AsConstant();
ConstantInstr* constant_function_type_args =
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/kernel_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698