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

Unified Diff: runtime/vm/code_generator.cc

Issue 8491055: Second attempt at finalizing all classes in the VM (fix issue 364). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 9 years, 1 month 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') | runtime/vm/code_generator_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/code_generator.cc
===================================================================
--- runtime/vm/code_generator.cc (revision 1474)
+++ runtime/vm/code_generator.cc (working copy)
@@ -327,15 +327,16 @@
instance.IsInstanceOf(type, type_instantiator) ?
Bool::True() : Bool::False());
if (FLAG_trace_type_checks) {
- Class& cls = Class::Handle(instance.clazz());
- // TODO(regis): Remove once all classes finalized.
- if (cls.is_finalized()) {
- OS::Print("InstanceOf '%s' %s '%s'\n",
- String::Handle(Type::Handle(instance.GetType()).Name()).
- ToCString(),
- (result.raw() == Bool::True()) ? "is" : "is !",
- String::Handle(type.Name()).ToCString());
+ const Type& instance_type = Type::Handle(instance.GetType());
+ Type& instantiated_type = Type::Handle(type.raw());
+ if (!type.IsInstantiated()) {
+ // Instantiate type before printing.
+ instantiated_type = type.InstantiateFrom(type_instantiator, 0);
}
+ OS::Print("InstanceOf: '%s' %s '%s'\n",
+ String::Handle(instance_type.Name()).ToCString(),
+ (result.raw() == Bool::True()) ? "is" : "is !",
+ String::Handle(instantiated_type.Name()).ToCString());
}
arguments.SetReturn(result);
}
« no previous file with comments | « runtime/vm/class_finalizer.cc ('k') | runtime/vm/code_generator_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698