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);
+  super_type ^= ResolveType(cls, super_type);
   if (super_type.IsTypeParameter()) {

[regis, 2011/12/01 19:20:43]

Since super_type is now a Type, this test always fails.
This test can be safely removed, because we do not resolve types to
TypeParameter in the class finalizer anymore. See the TODO at function
ResolveType().

[srdjan, 2011/12/01 20:04:09]

Removed code.
I think it is better if I implement the TODO for ResolveType, and remove the
result.

     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());
   }
   cls.set_super_type(super_type);
   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());
@@ skipping 186 matching lines @@
 // 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(

[regis, 2011/12/01 19:20:43]

I think this should always return a RawType*.
However, ClassFinalizer::FinalizeType() must still return a RawAbstractType*,
because it can be called on TypeParameter, which is then not canonicalized.

[srdjan, 2011/12/01 20:04:09]

Done.

     const AbstractType& 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));
     isolate->set_long_jump_base(base);
@@ skipping 295 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 286 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