Update VM to handle malformed types according to revised spec (issues 9055,

runtime/vm/class_finalizer.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_CLASS_FINALIZER_H_
 #define VM_CLASS_FINALIZER_H_
 
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 
@@ skipping 16 matching lines @@
 // Traverses all pending, unfinalized classes, validates and marks them as
 // finalized.
 class ClassFinalizer : public AllStatic {
  public:
   // Modes for type resolution and finalization. The ordering is relevant.
   enum FinalizationKind {
     kIgnore,                   // Type is ignored and replaced by dynamic.
     kDoNotResolve,             // Type resolution is postponed.
     kResolveTypeParameters,    // Resolve type parameters only.
     kFinalize,                 // Type resolution and type finalization are
-                               // required; a malformed type is tolerated, since
-                               // the type may be used as a type annotation.
+                               // required; replace a malformed type by dynamic.
     kCanonicalize,             // Same as kFinalize, but with canonicalization.
-    kCanonicalizeExpression,   // Same as kCanonicalize, but do not tolerate
-                               // wrong number of type arguments or ambiguous
-                               // type reference, since the type is not used as
-                               // a type annotation, but as a type expression.
     kCanonicalizeWellFormed    // Error-free resolution, finalization, and
                                // canonicalization are required; a malformed
-                               // type is not tolerated.
+                               // type is marked as such.
   };
 
   // Finalize given type while parsing class cls.
   // Also canonicalize type if applicable.
   static RawAbstractType* FinalizeType(const Class& cls,
                                        const AbstractType& type,
                                        FinalizationKind finalization);
 
   // Allocate, finalize, and return a new malformed type as if it was declared
   // in class cls at the given token position.
   // If not null, prepend prev_error to the error message built from the format
   // string and its arguments.
   static RawType* NewFinalizedMalformedType(const Error& prev_error,
                                             const Class& cls,
                                             intptr_t type_pos,
-                                            FinalizationKind finalization,
                                             const char* format, ...)
-       PRINTF_ATTRIBUTE(5, 6);
+       PRINTF_ATTRIBUTE(4, 5);
 
   // Depending on the given type, finalization mode, and execution mode, mark
   // the given type as malformed or report a compile time error.
   // If not null, prepend prev_error to the error message built from the format
   // string and its arguments.
   static void FinalizeMalformedType(const Error& prev_error,
                                     const Class& cls,
                                     const Type& type,
-                                    FinalizationKind finalization,
                                     const char* format, ...)
-       PRINTF_ATTRIBUTE(5, 6);
+       PRINTF_ATTRIBUTE(4, 5);
 
   // Return false if we still have classes pending to be finalized.
   static bool AllClassesFinalized();
 
   // Return whether class finalization failed.
   // The function returns true if the finalization was successful.
   // If finalization fails, an error message is set in the sticky error field
   // in the object store.
   static bool FinalizePendingClasses();
 
@@ skipping 52 matching lines @@
   static void FinalizeUpperBounds(const Class& cls);
   static void ResolveAndFinalizeSignature(const Class& cls,
                                           const Function& function);
   static void ResolveAndFinalizeMemberTypes(const Class& cls);
   static void PrintClassInformation(const Class& cls);
   static void CollectInterfaces(const Class& cls,
                                 const GrowableObjectArray& interfaces);
   static void ReportMalformedType(const Error& prev_error,
                                   const Class& cls,
                                   const Type& type,
-                                  FinalizationKind finalization,
                                   const char* format,
                                   va_list args);
   static void ReportError(const Error& error);
   static void ReportError(const Script& script,
                           intptr_t token_index,
                           const char* format, ...) PRINTF_ATTRIBUTE(3, 4);
   static void ReportError(const char* format, ...) PRINTF_ATTRIBUTE(1, 2);
 
   // Verify implicit offsets recorded in the VM for direct access to fields of
   // Dart instances (e.g: _TypedListView, _ByteDataView).
   static void VerifyImplicitFieldOffsets();
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_FINALIZER_H_