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

Unified Diff: runtime/vm/class_finalizer.cc

Issue 10205006: Mark types as instantiated or uninstantiated upon finalization. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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 | « no previous file | runtime/vm/object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/class_finalizer.cc
===================================================================
--- runtime/vm/class_finalizer.cc (revision 6893)
+++ runtime/vm/class_finalizer.cc (working copy)
@@ -700,7 +700,11 @@
ASSERT(full_arguments.IsNull()); // Use null vector for raw type.
}
// Mark the type as finalized.
- parameterized_type.set_is_finalized();
+ if (parameterized_type.IsInstantiated()) {
+ parameterized_type.set_is_finalized_instantiated();
+ } else {
+ parameterized_type.set_is_finalized_uninstantiated();
+ }
// Upper bounds of the finalized type arguments are only verified in checked
// mode, since bound errors are never reported by the vm in production mode.
@@ -729,7 +733,12 @@
}
}
} else {
- parameterized_type.set_is_finalized();
+ // Mark the type as finalized.
+ if (parameterized_type.IsInstantiated()) {
+ parameterized_type.set_is_finalized_instantiated();
+ } else {
+ parameterized_type.set_is_finalized_uninstantiated();
+ }
}
return parameterized_type.Canonicalize();
}
@@ -1305,7 +1314,7 @@
type.set_arguments(AbstractTypeArguments::Handle());
}
if (!type.IsFinalized()) {
- type.set_is_finalized();
+ type.set_is_finalized_instantiated();
// Do not canonicalize malformed types, since they may not be resolved.
} else {
// The only case where the malformed type was already finalized is when its
« no previous file with comments | « no previous file | runtime/vm/object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698