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

Unified Diff: runtime/vm/object.cc

Issue 2811643004: Added missing canonicalization of typedef signature instantiated during (Closed)
Patch Set: 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/class_finalizer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 66fc98ee3bf1ad257738807ca2870329c91296f0..f6177b2809b670ae68a2c8e3fc1f3a0635834a97 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -18186,11 +18186,10 @@ RawAbstractType* BoundedType::InstantiateFrom(
if ((Isolate::Current()->type_checks()) && (bound_error != NULL) &&
bound_error->IsNull()) {
AbstractType& upper_bound = AbstractType::Handle(bound());
- ASSERT(upper_bound.IsFinalized());
ASSERT(!upper_bound.IsObjectType() && !upper_bound.IsDynamicType());
AbstractType& instantiated_upper_bound =
AbstractType::Handle(upper_bound.raw());
- if (!upper_bound.IsInstantiated()) {
+ if (upper_bound.IsFinalized() && !upper_bound.IsInstantiated()) {
instantiated_upper_bound =
upper_bound.InstantiateFrom(instantiator_type_arguments, bound_error,
instantiation_trail, bound_trail, space);
« no previous file with comments | « runtime/vm/class_finalizer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698