Manage and capture class and function instantiators in the parser.

runtime/vm/class_finalizer.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/class_finalizer.h"
 
 #include "vm/code_generator.h"
 #include "vm/flags.h"
 #include "vm/hash_table.h"
 #include "vm/heap.h"
@@ skipping 1145 matching lines @@
   if (FLAG_trace_type_finalization) {
     THR_Print("Finalizing type '%s' for class '%s'\n",
               String::Handle(zone, type.Name()).ToCString(),
               String::Handle(zone, cls.Name()).ToCString());
   }
 
   if (type.IsTypeParameter()) {
     const TypeParameter& type_parameter = TypeParameter::Cast(type);
     const Class& parameterized_class =
         Class::Handle(zone, type_parameter.parameterized_class());
-    ASSERT(!parameterized_class.IsNull());
-    // The index must reflect the position of this type parameter in the type
-    // arguments vector of its parameterized class. The offset to add is the
-    // number of type arguments in the super type, which is equal to the
-    // difference in number of type arguments and type parameters of the
-    // parameterized class.
-    const intptr_t offset = parameterized_class.NumTypeArguments() -
-                            parameterized_class.NumTypeParameters();
-    // Calling NumTypeParameters() may finalize this type parameter if it
-    // belongs to a mixin application class.
-    if (!type_parameter.IsFinalized()) {
-      type_parameter.set_index(type_parameter.index() + offset);
-      type_parameter.SetIsFinalized();
+    if (!parameterized_class.IsNull()) {
+      // The index must reflect the position of this type parameter in the type
+      // arguments vector of its parameterized class. The offset to add is the
+      // number of type arguments in the super type, which is equal to the
+      // difference in number of type arguments and type parameters of the
+      // parameterized class.
+      const intptr_t offset = parameterized_class.NumTypeArguments() -
+                              parameterized_class.NumTypeParameters();
+      // Calling NumTypeParameters() may finalize this type parameter if it
+      // belongs to a mixin application class.
+      if (!type_parameter.IsFinalized()) {
+        type_parameter.set_index(type_parameter.index() + offset);
+        type_parameter.SetIsFinalized();
+      } else {
+        ASSERT(cls.IsMixinApplication());
+      }
     } else {
-      ASSERT(cls.IsMixinApplication());
+      // A function type parameter is always finalized.
+      ASSERT(type_parameter.IsFinalized());
     }
 
     if (FLAG_trace_type_finalization) {
       THR_Print("Done finalizing type parameter '%s' with index %" Pd "\n",
                 String::Handle(zone, type_parameter.name()).ToCString(),
                 type_parameter.index());
     }
 
     // We do not canonicalize type parameters.
     return type_parameter.raw();
@@ skipping 2513 matching lines @@
   ProgramVisitor::VisitFunctions(&function_visitor);
 
   class ClearCodeClassVisitor : public ClassVisitor {
     void Visit(const Class& cls) { cls.DisableAllocationStub(); }
   };
   ClearCodeClassVisitor class_visitor;
   ProgramVisitor::VisitClasses(&class_visitor);
 }
 
 }  // namespace dart