Address Regis' comments, replace AbstractType with Type where possible.

runtime/vm/class_finalizer.cc

 // Copyright (c) 2011, 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/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
@@ skipping 274 matching lines @@
   }
   return resolved_class.raw();
 }
 
 
 // Resolve unresolved supertype (String -> Class).
 void ClassFinalizer::ResolveSuperType(const Class& cls) {
   if (cls.is_finalized()) {
     return;
   }
-  AbstractType& super_type = AbstractType::Handle(cls.super_type());
+  Type& super_type = Type::Handle(cls.super_type());
   if (super_type.IsNull()) {
     return;
   }
   // Resolve failures lead to a longjmp.
-  super_type = ResolveType(cls, super_type);
-  if (super_type.IsTypeParameter()) {
-    String& class_name = String::Handle(cls.Name());
-    String& type_parameter_name = String::Handle(super_type.Name());
-    ReportError("'%s' cannot extend or implement type parameter '%s'.\n",
-                class_name.ToCString(),
-                type_parameter_name.ToCString());
-  }
+  ResolveType(cls, super_type);
   cls.set_super_type(super_type);

[regis, 2011/12/01 20:53:17]

Since we now resolve the type in place, you do not need to write it back after
calling ResolveType.

[srdjan, 2011/12/01 21:04:00]

Done.

   const Class& super_class = Class::Handle(super_type.type_class());
   if (cls.is_interface() != super_class.is_interface()) {
     String& class_name = String::Handle(cls.Name());
     String& super_class_name = String::Handle(super_class.Name());
     const Script& script = Script::Handle(cls.script());
     ReportError(script, -1,
                 "class '%s' and superclass '%s' are not "
                 "both classes or both interfaces.\n",
                 class_name.ToCString(),
                 super_class_name.ToCString());
@@ skipping 115 matching lines @@
     ReportError(script, unresolved_factory_class.token_index(),
                 "mismatch in number or names of type parameters between "
                 "factory clause of interface '%s' and actual factory "
                 "class '%s'.\n",
                 interface_name.ToCString(),
                 factory_name.ToCString());
   }
 }
 
 
-// TODO(regis): Now that we do not resolve type parameters anymore, we could
-// make this function void and resolve the type in place.
-RawAbstractType* ClassFinalizer::ResolveType(
-    const Class& cls, const AbstractType& type) {
+void ClassFinalizer::ResolveType(const Class& cls, const AbstractType& type) {
   if (type.IsResolved()) {
-    return type.raw();
+    return;
   }
   if (FLAG_trace_type_finalization) {
     OS::Print("Resolve type '%s'\n", String::Handle(type.Name()).ToCString());
   }
 
   // Resolve the type class.
   if (!type.HasResolvedTypeClass()) {
     // Type parameters are always resolved in the parser in the correct
     // non-static scope or factory scope. That resolution scope is unknown here.
     // Being able to resolve a type parameter from class cls here would indicate
@@ skipping 13 matching lines @@
     parameterized_type.set_type_class(Object::Handle(type_class.raw()));
   }
 
   // Resolve type arguments, if any.
   const TypeArguments& arguments = TypeArguments::Handle(type.arguments());
   if (!arguments.IsNull()) {
     intptr_t num_arguments = arguments.Length();
     AbstractType& type_argument = AbstractType::Handle();
     for (intptr_t i = 0; i < num_arguments; i++) {
       type_argument = arguments.TypeAt(i);
-      type_argument = ResolveType(cls, type_argument);
+      ResolveType(cls, type_argument);
       arguments.SetTypeAt(i, type_argument);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

     }
   }
-  return type.raw();
 }
 
 
 // Finalize the type argument vector 'arguments' of the type defined by the
 // class 'cls' parameterized with the type arguments 'cls_args'.
 // The vector 'cls_args' is already initialized as a subvector at the correct
 // position in the passed in 'arguments' vector.
 // The subvector 'cls_args' has length cls.NumTypeParameters() and starts at
 // offset cls.NumTypeArguments() - cls.NumTypeParameters() of the 'arguments'
 // vector.
 // Example:
 //   Declared: class C<K, V> extends B<V> { ... }
 //             class B<T> extends Array<int> { ... }
 //   Input:    C<String, double> expressed as
 //             cls = C, arguments = [null, null, String, double],
 //             i.e. cls_args = [String, double], offset = 2, length = 2.
 //   Output:   arguments = [int, double, String, double]
 void ClassFinalizer::FinalizeTypeArguments(const Class& cls,
                                            const TypeArguments& arguments) {
   ASSERT(arguments.Length() >= cls.NumTypeArguments());
-  AbstractType& super_type = AbstractType::Handle(cls.super_type());
+  Type& super_type = Type::Handle(cls.super_type());
   if (!super_type.IsNull()) {
-    super_type = FinalizeType(super_type);
+    super_type ^= FinalizeType(super_type);
     cls.set_super_type(super_type);
     const Class& super_class = Class::Handle(super_type.type_class());
     const TypeArguments& super_type_args =
         TypeArguments::Handle(super_type.arguments());
     const intptr_t num_super_type_params = super_class.NumTypeParameters();
     const intptr_t offset = super_class.NumTypeArguments();
     const intptr_t super_offset = offset - num_super_type_params;
     ASSERT(offset == (cls.NumTypeArguments() - cls.NumTypeParameters()));
     AbstractType& super_type_arg = AbstractType::Handle();
     for (intptr_t i = 0; i < num_super_type_params; i++) {
@@ skipping 40 matching lines @@
           ReportError(script, -1,
                       "type argument '%s' of class '%s' "
                       "does not extend type '%s'\n",
                       type_argument_name.ToCString(),
                       class_name.ToCString(),
                       extends_name.ToCString());
         }
       }
     }
   }
-  AbstractType& super_type = AbstractType::Handle(cls.super_type());
+  const Type& super_type = Type::Handle(cls.super_type());
   if (!super_type.IsNull()) {
     ASSERT(super_type.IsFinalized());
     const Class& super_class = Class::Handle(super_type.type_class());
     VerifyUpperBounds(super_class, arguments);
   }
 }
 
 
 RawAbstractType* ClassFinalizer::FinalizeType(const AbstractType& type) {
   ASSERT(type.IsResolved());
@@ skipping 99 matching lines @@
     if (FLAG_enable_type_checks) {
       VerifyUpperBounds(type_class, full_arguments);
     }
   } else {
     parameterized_type.set_is_finalized();
   }
   return parameterized_type.Canonicalize();
 }
 
 
-RawAbstractType* ClassFinalizer::FinalizeAndCanonicalizeType(
-    const AbstractType& type, String* errmsg) {
+RawType* ClassFinalizer::FinalizeAndCanonicalizeType(const Type& type,
+                                                     String* errmsg) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
-    const AbstractType& canonical_type =
-        AbstractType::Handle(FinalizeType(type));
+    Type& canonical_type = Type::Handle();
+    canonical_type ^= FinalizeType(type);
     isolate->set_long_jump_base(base);
     *errmsg = String::null();
     return canonical_type.raw();
   } else {
     // Error occured: Get the error message.
     isolate->set_long_jump_base(base);
     *errmsg = isolate->object_store()->sticky_error();
     return type.raw();
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 void ClassFinalizer::ResolveAndFinalizeSignature(const Class& cls,
                                                  const Function& function) {
   // Resolve result type.
   AbstractType& type = AbstractType::Handle(function.result_type());
   if (!type.IsResolved()) {
     if (function.IsFactory()) {
       // The signature class of the factory for a generic class holds the type
       // parameters and their upper bounds. Copy the signature class from the
       // result before it gets resolved.
       const UnresolvedClass& unresolved_type_class =
           UnresolvedClass::Handle(type.unresolved_class());
       const Class& factory_signature_class =
           Class::Handle(unresolved_type_class.factory_signature_class());
       ASSERT(!factory_signature_class.IsNull());
       function.set_signature_class(factory_signature_class);
-      type = ResolveType(cls, type);
+      ResolveType(cls, type);
       function.set_result_type(type);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

       const Class& type_class = Class::Handle(type.type_class());
       // Verify that the factory signature declares the same number of type
       // parameters as the return type class or interface.
       ResolveAndFinalizeUpperBounds(factory_signature_class);
       if (factory_signature_class.NumTypeParameters() !=
           type_class.NumTypeParameters()) {
         const String& function_name = String::Handle(function.name());
         if (factory_signature_class.NumTypeParameters() == 0) {
           // TODO(regis): For now, and until the core lib is fixed, we accept a
           // factory method with missing list of type parameters and use the
@@ skipping 12 matching lines @@
           const Class& enclosing_class = Class::Handle(function.owner());
           const Script& script = Script::Handle(enclosing_class.script());
           ReportError(script, unresolved_type_class.token_index(),
                       "factory method '%s' must declare %d type parameter%s.\n",
                       function_name.ToCString(),
                       type_class.NumTypeParameters(),
                       type_class.NumTypeParameters() > 1 ? "s" : "");
         }
       }
     } else {
-      type = ResolveType(cls, type);
+      ResolveType(cls, type);
       function.set_result_type(type);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

     }
   }
   type = FinalizeType(type);
   function.set_result_type(type);
   // Resolve formal parameter types.
   const intptr_t num_parameters = function.NumberOfParameters();
   for (intptr_t i = 0; i < num_parameters; i++) {
     type = function.ParameterTypeAt(i);
-    type = ResolveType(cls, type);
+    ResolveType(cls, type);
     function.SetParameterTypeAt(i, type);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

     type = FinalizeType(type);
     function.SetParameterTypeAt(i, type);
   }
 }
 
 
 static RawClass* FindSuperOwnerOfInstanceMember(const Class& cls,
                                                 const String& name) {
   Class& super_class = Class::Handle();
   Function& function = Function::Handle();
@@ skipping 35 matching lines @@
 // Resolve and finalize the upper bounds of the type parameters of class cls.
 void ClassFinalizer::ResolveAndFinalizeUpperBounds(const Class& cls) {
   const intptr_t num_type_params = cls.NumTypeParameters();
   AbstractType& type_extends = AbstractType::Handle();
   const TypeArguments& extends_array =
       TypeArguments::Handle(cls.type_parameter_extends());
   ASSERT((extends_array.IsNull() && (num_type_params == 0)) ||
          (extends_array.Length() == num_type_params));
   for (intptr_t i = 0; i < num_type_params; i++) {
     type_extends = extends_array.TypeAt(i);
-    type_extends = ResolveType(cls, type_extends);
+    ResolveType(cls, type_extends);
     extends_array.SetTypeAt(i, type_extends);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

     type_extends = FinalizeType(type_extends);
     extends_array.SetTypeAt(i, type_extends);
   }
 }
 
 
 void ClassFinalizer::ResolveAndFinalizeMemberTypes(const Class& cls) {
   // Note that getters and setters are explicitly listed as such in the list of
   // functions of a class, so we do not need to consider fields as implicitly
   // generating getters and setters.
   // The only compile errors we report are therefore:
   // - a getter having the same name as a method (but not a getter) in a super
   //   class or in a subclass.
   // - a setter having the same name as a method (but not a setter) in a super
   //   class or in a subclass.
   // - a static field, instance field, or static method (but not an instance
   //   method) having the same name as an instance member in a super class.
 
   // Resolve type of fields and check for conflicts in super classes.
   Array& array = Array::Handle(cls.fields());
   Field& field = Field::Handle();
   AbstractType& type = AbstractType::Handle();
   String& name = String::Handle();
   Class& super_class = Class::Handle();
   intptr_t num_fields = array.Length();
   for (intptr_t i = 0; i < num_fields; i++) {
     field ^= array.At(i);
     type = field.type();
-    type = ResolveType(cls, type);
+    ResolveType(cls, type);
     field.set_type(type);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

     type = FinalizeType(type);
     field.set_type(type);
     name = field.name();
     super_class = FindSuperOwnerOfInstanceMember(cls, name);
     if (!super_class.IsNull()) {
       const String& class_name = String::Handle(cls.Name());
       const String& super_class_name = String::Handle(super_class.Name());
       const Script& script = Script::Handle(cls.script());
       ReportError(script, field.token_index(),
                   "field '%s' of class '%s' conflicts with instance "
@@ skipping 124 matching lines @@
   ASSERT(!cls.IsSignatureClass());
   if (!IsSuperCycleFree(cls)) {
     const String& name = String::Handle(cls.Name());
     const Script& script = Script::Handle(cls.script());
     ReportError(script, -1,
                 "class '%s' has a cycle in its superclass relationship.\n",
                 name.ToCString());
   }
   GrowableArray<const Class*> visited;
   ResolveInterfaces(cls, &visited);
-  AbstractType& super_type = AbstractType::Handle(cls.super_type());
+  Type& super_type = Type::Handle(cls.super_type());
   if (!super_type.IsNull()) {
     const Class& super_class = Class::Handle(super_type.type_class());
     // Finalize super class and super type.
     FinalizeClass(super_class, generating_snapshot);
-    super_type = FinalizeType(super_type);
+    super_type ^= FinalizeType(super_type);
     cls.set_super_type(super_type);
   }
   if (cls.is_interface()) {
     if (cls.HasFactoryClass()) {
       const Class& factory_class = Class::Handle(cls.FactoryClass());
       // Finalize factory class.
       if (!factory_class.is_finalized()) {
         FinalizeClass(factory_class, generating_snapshot);
         // Finalizing the factory class may indirectly finalize this interface.
         if (cls.is_finalized()) {
@@ skipping 126 matching lines @@
   // about allowed interfaces are lifted.
   const bool cls_belongs_to_core_lib =
       (cls.library() == Library::CoreLibrary()) ||
       (cls.library() == Library::CoreImplLibrary());
 
   // Resolve and check the interfaces of cls.
   visited->Add(&cls);
   AbstractType& interface = AbstractType::Handle();
   for (intptr_t i = 0; i < super_interfaces.Length(); i++) {
     interface ^= super_interfaces.At(i);
-    interface = ResolveType(cls, interface);
+    ResolveType(cls, interface);
     super_interfaces.SetAt(i, interface);

[regis, 2011/12/01 20:53:17]

ditto

[srdjan, 2011/12/01 21:04:00]

Done.

     if (interface.IsTypeParameter()) {
       const Script& script = Script::Handle(cls.script());
       ReportError(script, -1,
                   "Type parameter '%s' cannot be used as interface\n",
                   String::Handle(interface.Name()).ToCString());
     }
     const Class& interface_class = Class::Handle(interface.type_class());
     if (!interface_class.is_interface()) {
       const Script& script = Script::Handle(cls.script());
       ReportError(script, -1,
@@ skipping 138 matching lines @@
   va_end(args);
   if (FLAG_warning_as_error) {
     Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
     UNREACHABLE();
   } else {
     OS::Print(message_buffer);
   }
 }
 
 }  // namespace dart