Stop resolving classes prematurely in the vm (issue 11023).

runtime/vm/parser.cc

 // 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.
 
 #include "vm/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 1263 matching lines @@
     // We have an identifier followed by a 'follower' token.
     // We either parse a type or assume that no type is specified.
     if ((follower == Token::kLT) ||  // Parameterized type.
         (follower == Token::kPERIOD) ||  // Qualified class name of type.
         Token::IsIdentifier(follower) ||  // Parameter name following a type.
         (follower == Token::kTHIS)) {  // Field parameter following a type.
       // The types of formal parameters are never ignored, even in unchecked
       // mode, because they are part of the function type of closurized
       // functions appearing in type tests with typedefs.
       parameter.type = &AbstractType::ZoneHandle(
-          ParseType(is_top_level_ ? ClassFinalizer::kTryResolve :
+          ParseType(is_top_level_ ? ClassFinalizer::kResolveTypeParameters :
                                     ClassFinalizer::kCanonicalize));
     } else {
       parameter.type = &Type::ZoneHandle(Type::DynamicType());
     }
   }
   if (!this_seen && (CurrentToken() == Token::kTHIS)) {
     ConsumeToken();
     ExpectToken(Token::kPERIOD);
     this_seen = true;
     parameter.is_field_initializer = true;
@@ skipping 1498 matching lines @@
     }
   }
 
   // Parse redirecting factory constructor.
   Type& redirection_type = Type::Handle();
   String& redirection_identifier = String::Handle();
   if (method->IsFactory() && (CurrentToken() == Token::kASSIGN)) {
     ConsumeToken();
     const intptr_t type_pos = TokenPos();
     const AbstractType& type = AbstractType::Handle(
-        ParseType(ClassFinalizer::kTryResolve));
-    if (!type.IsMalformed() &&
-        (type.IsTypeParameter() || type.IsDynamicType())) {
+        ParseType(ClassFinalizer::kResolveTypeParameters));
+    if (!type.IsMalformed() && type.IsTypeParameter()) {
       // Replace the type with a malformed type and compile a throw when called.
       redirection_type = ClassFinalizer::NewFinalizedMalformedType(
           Error::Handle(),  // No previous error.
           current_class(),
           type_pos,
-          ClassFinalizer::kTryResolve,  // No compile-time error.
-          "factory '%s' may not redirect to %s'%s'",
+          ClassFinalizer::kResolveTypeParameters,  // No compile-time error.
+          "factory '%s' may not redirect to type parameter '%s'",
           method->name->ToCString(),
-          type.IsTypeParameter() ? "type parameter " : "",
-          type.IsTypeParameter() ?
-              String::Handle(type.UserVisibleName()).ToCString() : "dynamic");
+          String::Handle(type.UserVisibleName()).ToCString());
     } else {
       redirection_type ^= type.raw();
     }
     if (CurrentToken() == Token::kPERIOD) {
       // Named constructor or factory.
       ConsumeToken();
       redirection_identifier = ExpectIdentifier("identifier expected")->raw();
     }
   } else if (CurrentToken() == Token::kCOLON) {
     // Parse initializers.
@@ skipping 188 matching lines @@
     bool has_initializer = CurrentToken() == Token::kASSIGN;
     bool has_simple_literal = false;
     if (has_initializer) {
       ConsumeToken();
       init_value = Object::sentinel().raw();
       // For static const fields, the initialization expression
       // will be parsed through the kConstImplicitGetter method
       // invocation/compilation.
       // For instance fields, the expression is parsed when a constructor
       // is compiled.
-      // For static fields with very simple initializer expressions
+      // For static const fields with very simple initializer expressions
       // (e.g. a literal number or string) we optimize away the
       // kConstImplicitGetter and initialize the field here.
+      // We also do it for static final non-const fields, but only in production
+      // mode.
 
-      if (field->has_static && (field->has_final || field->has_const) &&
+      if (field->has_static &&
+          (field->has_const ||
+           (!FLAG_enable_type_checks && field->has_final)) &&
           (LookaheadToken(1) == Token::kSEMICOLON)) {
         has_simple_literal = IsSimpleLiteral(*field->type, &init_value);
       }
       SkipExpr();
     } else {
       if (field->has_const || (field->has_static && field->has_final)) {
         ErrorMsg(field->name_pos,
                  "%s%s field '%s' must have an initializer expression",
                  field->has_static ? "static " : "",
                  field->has_const ? "const" : "final",
@@ skipping 168 matching lines @@
           (follower == Token::kSET) ||  // Setter following a type.
           (follower == Token::kOPERATOR) ||  // Operator following a type.
           (Token::IsIdentifier(follower)) ||  // Member name following a type.
           ((follower == Token::kPERIOD) &&    // Qualified class name of type,
            (LookaheadToken(3) != Token::kLPAREN))) {  // but not a named constr.
         ASSERT(is_top_level_);
         // The declared type of fields is never ignored, even in unchecked mode,
         // because getters and setters could be closurized at some time (not
         // supported yet).
         member.type = &AbstractType::ZoneHandle(
-            ParseType(ClassFinalizer::kTryResolve));
+            ParseType(ClassFinalizer::kResolveTypeParameters));
       }
     }
   }
 
   // Optionally parse a (possibly named) constructor name or factory.
   if (IsIdentifier() &&
       (CurrentLiteral()->Equals(members->class_name()) || member.has_factory)) {
     member.name_pos = TokenPos();
     member.name = CurrentLiteral();  // Unqualified identifier.
     ConsumeToken();
@@ skipping 228 matching lines @@
       }
       // We do not check that the bounds are repeated. We use the original ones.
       // TODO(regis): Should we check?
     }
     cls.set_type_parameters(orig_type_parameters);
   }
   AbstractType& super_type = Type::Handle();
   if (CurrentToken() == Token::kEXTENDS) {
     ConsumeToken();
     const intptr_t type_pos = TokenPos();
-    super_type = ParseType(ClassFinalizer::kTryResolve);
+    super_type = ParseType(ClassFinalizer::kResolveTypeParameters);
     if (super_type.IsTypeParameter()) {
       ErrorMsg(type_pos,
                "class '%s' may not extend type parameter '%s'",
                class_name.ToCString(),
                String::Handle(super_type.UserVisibleName()).ToCString());
     }
-    if (super_type.IsDynamicType()) {
-      ErrorMsg(type_pos,
-               "class '%s' may not extend 'dynamic'",
-               class_name.ToCString());
-    }
     if (CurrentToken() == Token::kWITH) {
       super_type = ParseMixins(super_type);
     }
   } else {
     // No extends clause: implicitly extend Object, unless Object itself.
     if (!cls.IsObjectClass()) {
       super_type = Type::ObjectType();
     }
   }
   ASSERT(!super_type.IsNull() || cls.IsObjectClass());
@@ skipping 175 matching lines @@
 
   ExpectToken(Token::kASSIGN);
 
   if (CurrentToken() == Token::kABSTRACT) {
     mixin_application.set_is_abstract();
     ConsumeToken();
   }
 
   const intptr_t type_pos = TokenPos();
   AbstractType& type =
-      AbstractType::Handle(ParseType(ClassFinalizer::kTryResolve));
+      AbstractType::Handle(ParseType(ClassFinalizer::kResolveTypeParameters));
   if (type.IsTypeParameter()) {
     ErrorMsg(type_pos,
              "class '%s' may not extend type parameter '%s'",
              class_name.ToCString(),
              String::Handle(type.UserVisibleName()).ToCString());
   }
 
   if (CurrentToken() != Token::kWITH) {
     ErrorMsg("mixin application 'with Type' expected");
   }
@@ skipping 95 matching lines @@
                                script_,
                                alias_name_pos));
   library_.AddClass(function_type_alias);
   set_current_class(function_type_alias);
   // Parse the type parameters of the function type.
   ParseTypeParameters(function_type_alias);
   // At this point, the type parameters have been parsed, so we can resolve the
   // result type.
   if (!result_type.IsNull()) {
     ResolveTypeFromClass(function_type_alias,
-                         ClassFinalizer::kTryResolve,
+                         ClassFinalizer::kResolveTypeParameters,
                          &result_type);
   }
   // Parse the formal parameters of the function type.
   if (CurrentToken() != Token::kLPAREN) {
     ErrorMsg("formal parameter list expected");
   }
   ParamList func_params;
 
   // Add implicit closure object parameter.
   func_params.AddFinalParameter(
@@ skipping 176 matching lines @@
     const TypeArguments& type_parameters =
         TypeArguments::Handle(NewTypeArguments(type_parameters_array));
     cls.set_type_parameters(type_parameters);
     // Try to resolve the upper bounds, which will at least resolve the
     // referenced type parameters.
     const intptr_t num_types = type_parameters.Length();
     for (intptr_t i = 0; i < num_types; i++) {
       type_parameter ^= type_parameters.TypeAt(i);
       type_parameter_bound = type_parameter.bound();
       ResolveTypeFromClass(cls,
-                           ClassFinalizer::kTryResolve,
+                           ClassFinalizer::kResolveTypeParameters,
                            &type_parameter_bound);
       type_parameter.set_bound(type_parameter_bound);
     }
   }
 }
 
 
 RawAbstractTypeArguments* Parser::ParseTypeArguments(
     Error* malformed_error,
     ClassFinalizer::FinalizationKind finalization) {
@@ skipping 41 matching lines @@
   // First get all the interfaces already implemented by class.
   Array& cls_interfaces = Array::Handle(cls.interfaces());
   for (intptr_t i = 0; i < cls_interfaces.Length(); i++) {
     interface ^= cls_interfaces.At(i);
     all_interfaces.Add(interface);
   }
   // Now parse and add the new interfaces.
   do {
     ConsumeToken();
     intptr_t interface_pos = TokenPos();
-    interface = ParseType(ClassFinalizer::kTryResolve);
+    interface = ParseType(ClassFinalizer::kResolveTypeParameters);
     if (interface.IsTypeParameter()) {
       ErrorMsg(interface_pos,
                "type parameter '%s' may not be used in interface list",
                String::Handle(interface.UserVisibleName()).ToCString());
     }
-    if (interface.IsDynamicType()) {
-      ErrorMsg(interface_pos, "'dynamic' may not be used in interface list");
-    }
     all_interfaces.Add(interface);
   } while (CurrentToken() == Token::kCOMMA);
   cls_interfaces = Array::MakeArray(all_interfaces);
   cls.set_interfaces(cls_interfaces);
 }
 
 
 RawAbstractType* Parser::ParseMixins(const AbstractType& super_type) {
   TRACE_PARSER("ParseMixins");
   ASSERT(CurrentToken() == Token::kWITH);
 
   const GrowableObjectArray& mixin_apps =
       GrowableObjectArray::Handle(GrowableObjectArray::New());
   AbstractType& mixin_type = AbstractType::Handle();
   AbstractTypeArguments& mixin_type_arguments =
       AbstractTypeArguments::Handle();
   Class& mixin_application = Class::Handle();
   Type& mixin_application_type = Type::Handle();
   Type& mixin_super_type = Type::Handle();
   ASSERT(super_type.IsType());
   mixin_super_type ^= super_type.raw();
   Array& mixin_application_interfaces = Array::Handle();
   do {
     ConsumeToken();
     const intptr_t mixin_pos = TokenPos();
-    mixin_type = ParseType(ClassFinalizer::kTryResolve);
+    mixin_type = ParseType(ClassFinalizer::kResolveTypeParameters);
     if (mixin_type.IsTypeParameter()) {
       ErrorMsg(mixin_pos,
                "mixin type '%s' may not be a type parameter",
                String::Handle(mixin_type.UserVisibleName()).ToCString());
     }
 
     // The name of the mixin application class is a combination of
     // the superclass and mixin class.
     String& mixin_app_name = String::Handle();
     mixin_app_name = mixin_super_type.ClassName();
@@ skipping 12 matching lines @@
     // class implements. This is necessary so that type tests work.
     mixin_application_interfaces = Array::New(1);
     mixin_application_interfaces.SetAt(0, mixin_type);
     mixin_application.set_interfaces(mixin_application_interfaces);
 
     // For the type arguments of the mixin application type, we need
     // a copy of the type arguments to the mixin type. The simplest way
     // to get the copy is to rewind the parser, parse the mixin type
     // again and steal its type arguments.
     SetPosition(mixin_pos);
-    mixin_type = ParseType(ClassFinalizer::kTryResolve);
+    mixin_type = ParseType(ClassFinalizer::kResolveTypeParameters);
     mixin_type_arguments = mixin_type.arguments();
 
     mixin_application_type = Type::New(mixin_application,
                                        mixin_type_arguments,
                                        mixin_pos);
     mixin_super_type = mixin_application_type.raw();
     mixin_apps.Add(mixin_application_type);
   } while (CurrentToken() == Token::kCOMMA);
   return MixinAppType::New(super_type,
                            Array::Handle(Array::MakeArray(mixin_apps)));
 }
 
 
 void Parser::ParseTopLevelVariable(TopLevel* top_level,
                                    intptr_t metadata_pos) {
   TRACE_PARSER("ParseTopLevelVariable");
   const bool is_const = (CurrentToken() == Token::kCONST);
   // Const fields are implicitly final.
   const bool is_final = is_const || (CurrentToken() == Token::kFINAL);
   const bool is_static = true;
   const AbstractType& type =
       AbstractType::ZoneHandle(ParseConstFinalVarOrType(
-          FLAG_enable_type_checks ? ClassFinalizer::kTryResolve :
+          FLAG_enable_type_checks ? ClassFinalizer::kResolveTypeParameters :
                                     ClassFinalizer::kIgnore));
   Field& field = Field::Handle();
   Function& getter = Function::Handle();
   while (true) {
     const intptr_t name_pos = TokenPos();
     String& var_name = *ExpectIdentifier("variable name expected");
 
     if (library_.LookupLocalObject(var_name) != Object::null()) {
       ErrorMsg(name_pos, "'%s' is already defined", var_name.ToCString());
     }
@@ skipping 18 matching lines @@
     field.set_value(Instance::Handle(Instance::null()));
     top_level->fields.Add(field);
     library_.AddObject(field, var_name);
     if (metadata_pos >= 0) {
       library_.AddFieldMetadata(field, metadata_pos);
     }
     if (CurrentToken() == Token::kASSIGN) {
       ConsumeToken();
       Instance& field_value = Instance::Handle(Object::sentinel().raw());
       bool has_simple_literal = false;
-      if (is_final && (LookaheadToken(1) == Token::kSEMICOLON)) {
+      if ((is_const || (!FLAG_enable_type_checks && is_final)) &&
+          (LookaheadToken(1) == Token::kSEMICOLON)) {
         has_simple_literal = IsSimpleLiteral(type, &field_value);
       }
       SkipExpr();
       field.set_value(field_value);
       if (!has_simple_literal) {
         // Create a static const getter.
         String& getter_name = String::ZoneHandle(Field::GetterSymbol(var_name));
         getter = Function::New(getter_name,
                                RawFunction::kConstImplicitGetter,
                                is_static,
@@ skipping 38 matching lines @@
     ConsumeToken();
     is_external = true;
   }
   if (CurrentToken() == Token::kVOID) {
     ConsumeToken();
     result_type = Type::VoidType();
   } else {
     // Parse optional type.
     if ((CurrentToken() == Token::kIDENT) &&
         (LookaheadToken(1) != Token::kLPAREN)) {
-      result_type = ParseType(ClassFinalizer::kTryResolve);
+      result_type = ParseType(ClassFinalizer::kResolveTypeParameters);
     }
   }
   const intptr_t name_pos = TokenPos();
   const String& func_name = *ExpectIdentifier("function name expected");
 
   bool found = library_.LookupLocalObject(func_name) != Object::null();
   if (found && !is_patch) {
     ErrorMsg(name_pos, "'%s' is already defined", func_name.ToCString());
   } else if (!found && is_patch) {
     ErrorMsg(name_pos, "missing '%s' cannot be patched", func_name.ToCString());
@@ skipping 73 matching lines @@
   bool is_getter = (CurrentToken() == Token::kGET);
   if (CurrentToken() == Token::kGET ||
       CurrentToken() == Token::kSET) {
     ConsumeToken();
     result_type = Type::DynamicType();
   } else {
     if (CurrentToken() == Token::kVOID) {
       ConsumeToken();
       result_type = Type::VoidType();
     } else {
-      result_type = ParseType(ClassFinalizer::kTryResolve);
+      result_type = ParseType(ClassFinalizer::kResolveTypeParameters);
     }
     is_getter = (CurrentToken() == Token::kGET);
     if (CurrentToken() == Token::kGET || CurrentToken() == Token::kSET) {
       ConsumeToken();
     } else {
       UnexpectedToken();
     }
   }
   const intptr_t name_pos = TokenPos();
   const String* field_name = ExpectIdentifier("accessor name expected");
@@ skipping 975 matching lines @@
     } while (nesting_level > 0);
     if (nesting_level < 0) {
       return false;
     }
   }
   return true;
 }
 
 
 bool Parser::IsSimpleLiteral(const AbstractType& type, Instance* value) {
-  bool no_check = type.IsDynamicType();
-  if ((CurrentToken() == Token::kINTEGER) &&
-      (no_check || type.IsIntType() || type.IsNumberType())) {
+  // Assigning null never causes a type error.
+  if (CurrentToken() == Token::kNULL) {
+    *value = Instance::null();
+    return true;
+  }
+  // If the type of the const field is guaranteed to be instantiated once
+  // resolved at class finalization time, and if the type of the literal is one
+  // of int, double, String, or bool, then preset the field with the value and
+  // perform the type check (in checked mode only) at finalization time.
+  if (type.IsTypeParameter() ||
+      (type.arguments() != AbstractTypeArguments::null())) {
+    // Type parameters are always resolved eagerly by the parser and never
+    // resolved later by the class finalizer. Therefore, we know here that if
+    // 'type' is not a type parameter (an unresolved type will not get resolved
+    // to a type parameter later) and if 'type' has no type arguments, then it
+    // will be instantiated at class finalization time. Otherwise, we return
+    // false, since the type test would not be possible at finalization time for
+    // an uninstantiated type.
+    return false;
+  }
+  if (CurrentToken() == Token::kINTEGER) {
     *value = CurrentIntegerLiteral();
     return true;
-  } else if ((CurrentToken() == Token::kDOUBLE) &&
-      (no_check || type.IsDoubleType() || type.IsNumberType())) {
+  } else if (CurrentToken() == Token::kDOUBLE) {
     *value = CurrentDoubleLiteral();
     return true;
-  } else if ((CurrentToken() == Token::kSTRING) &&
-      (no_check || type.IsStringType())) {
+  } else if (CurrentToken() == Token::kSTRING) {
     *value = CurrentLiteral()->raw();
     return true;
-  } else if ((CurrentToken() == Token::kTRUE) &&
-      (no_check || type.IsBoolType())) {
+  } else if (CurrentToken() == Token::kTRUE) {
     *value = Bool::True().raw();
     return true;
-  } else if ((CurrentToken() == Token::kFALSE) &&
-      (no_check || type.IsBoolType())) {
+  } else if (CurrentToken() == Token::kFALSE) {
     *value = Bool::False().raw();
     return true;
-  } else if (CurrentToken() == Token::kNULL) {
-    *value = Instance::null();
-    return true;
   }
   return false;
 }
 
 
 // Returns true if the current token is kIDENT or a pseudo-keyword.
 bool Parser::IsIdentifier() {
   return Token::IsIdentifier(CurrentToken());
 }
 
@@ skipping 2634 matching lines @@
 // Resolve the given type and its type arguments from the given scope class
 // according to the given type finalization mode.
 // If the given scope class is null, use the current library, but do not try to
 // resolve type parameters.
 // Not all involved type classes may get resolved yet, but at least the type
 // parameters of the given class will get resolved, thereby relieving the class
 // finalizer from resolving type parameters out of context.
 void Parser::ResolveTypeFromClass(const Class& scope_class,
                                   ClassFinalizer::FinalizationKind finalization,
                                   AbstractType* type) {
-  ASSERT(finalization >= ClassFinalizer::kTryResolve);
+  ASSERT(finalization >= ClassFinalizer::kResolveTypeParameters);
   ASSERT(type != NULL);
   if (type->IsResolved()) {
     return;
   }
   // Resolve class.
   if (!type->HasResolvedTypeClass()) {
     const UnresolvedClass& unresolved_class =
         UnresolvedClass::Handle(type->unresolved_class());
     const String& unresolved_class_name =
         String::Handle(unresolved_class.ident());
@@ skipping 27 matching lines @@
                 type_parameter.token_pos(),
                 finalization,
                 "type parameter '%s' cannot be parameterized",
                 String::Handle(type_parameter.name()).ToCString());
             return;
           }
           *type = type_parameter.raw();
           return;
         }
       }
-      // Resolve classname in the scope of the current library.
-      Error& error = Error::Handle();
-      // If we finalize a type expression, as opposed to a type annotation, we
-      // tell the resolver (by passing NULL) to immediately report an ambiguous
-      // type as a compile time error.
-      resolved_type_class = ResolveClassInCurrentLibraryScope(
-          unresolved_class.token_pos(),
-          unresolved_class_name,
-          finalization >= ClassFinalizer::kCanonicalizeExpression ?
-              NULL : &error);
-      if (!error.IsNull()) {
-        *type = ClassFinalizer::NewFinalizedMalformedType(
-            error,
-            scope_class,
+      // The referenced class may not have been parsed yet. It would be wrong
+      // to resolve it too early to an imported class of the same name.
+      if (finalization > ClassFinalizer::kResolveTypeParameters) {
+        // Resolve classname in the scope of the current library.
+        Error& error = Error::Handle();
+        // If we finalize a type expression, as opposed to a type annotation,
+        // we tell the resolver (by passing NULL) to immediately report an
+        // ambiguous type as a compile time error.
+        resolved_type_class = ResolveClassInCurrentLibraryScope(
             unresolved_class.token_pos(),
-            finalization,
-            "cannot resolve class '%s'",
-            unresolved_class_name.ToCString());
-        return;
+            unresolved_class_name,
+            finalization >= ClassFinalizer::kCanonicalizeExpression ?
+                NULL : &error);
+        if (!error.IsNull()) {
+          *type = ClassFinalizer::NewFinalizedMalformedType(
+              error,
+              scope_class,
+              unresolved_class.token_pos(),
+              finalization,
+              "cannot resolve class '%s'",
+              unresolved_class_name.ToCString());
+          return;
+        }
       }
     } else {
       LibraryPrefix& lib_prefix =
           LibraryPrefix::Handle(unresolved_class.library_prefix());
       // Resolve class name in the scope of the library prefix.
       Error& error = Error::Handle();
       // If we finalize a type expression, as opposed to a type annotation, we
       // tell the resolver (by passing NULL) to immediately report an ambiguous
       // type as a compile time error.
       resolved_type_class = ResolveClassInPrefixScope(
@@ skipping 441 matching lines @@
       import = library_.ImportAt(i);
       imported_obj = LookupNameInImport(isolate(), import, name);
       if (!imported_obj.IsNull()) {
         lib ^= import.library();
         if (!first_lib_url.IsNull()) {
           // Found duplicate definition.
           Error& ambiguous_ref_error = Error::Handle();
           if (first_lib_url.raw() == lib.url()) {
             ambiguous_ref_error = FormatErrorMsg(
                 script_, ident_pos, "Error",
-                "ambiguous reference: "
-                "'%s' as library '%s' is imported multiple times",
+                "ambiguous reference to '%s', "
+                "as library '%s' is imported multiple times",
                 name.ToCString(),
                 first_lib_url.ToCString());
           } else {
             ambiguous_ref_error = FormatErrorMsg(
                 script_, ident_pos, "Error",
                 "ambiguous reference: "
                 "'%s' is defined in library '%s' and also in '%s'",
                 name.ToCString(),
                 first_lib_url.ToCString(),
                 String::Handle(lib.url()).ToCString());
@@ skipping 298 matching lines @@
   // In production mode, malformed type arguments are mapped to dynamic.
   // In checked mode, a type with malformed type arguments is malformed.
   if (FLAG_enable_type_checks && !malformed_error.IsNull()) {
     Type& parameterized_type = Type::Handle(isolate());
     parameterized_type ^= type.raw();
     parameterized_type.set_type_class(
         Class::Handle(isolate(), Object::dynamic_class()));
     parameterized_type.set_arguments(Object::null_abstract_type_arguments());
     parameterized_type.set_malformed_error(malformed_error);
   }
-  if (finalization >= ClassFinalizer::kTryResolve) {
+  if (finalization >= ClassFinalizer::kResolveTypeParameters) {
     ResolveTypeFromClass(current_class(), finalization, &type);
     if (finalization >= ClassFinalizer::kCanonicalize) {
       type ^= ClassFinalizer::FinalizeType(current_class(), type, finalization);
     }
   }
   return type.raw();
 }
 
 
 void Parser::CheckConstructorCallTypeArguments(
@@ skipping 82 matching lines @@
     // Allocate and initialize the const list at compile time.
     Array& const_list =
         Array::ZoneHandle(Array::New(element_list.length(), Heap::kOld));
     const_list.SetTypeArguments(
         AbstractTypeArguments::Handle(type_arguments.Canonicalize()));
     Error& malformed_error = Error::Handle();
     for (int i = 0; i < element_list.length(); i++) {
       AstNode* elem = element_list[i];
       // Arguments have been evaluated to a literal value already.
       ASSERT(elem->IsLiteralNode());
+      ASSERT(!is_top_level_);  // We cannot check unresolved types.
       if (FLAG_enable_type_checks &&
           !element_type.IsDynamicType() &&
           (!elem->AsLiteralNode()->literal().IsNull() &&
            !elem->AsLiteralNode()->literal().IsInstanceOf(
                element_type, TypeArguments::Handle(), &malformed_error))) {
         // If the failure is due to a malformed type error, display it instead.
         if (!malformed_error.IsNull()) {
           ErrorMsg(malformed_error);
         } else {
           ErrorMsg(elem->AsLiteralNode()->token_pos(),
@@ skipping 176 matching lines @@
     // The resulting immutable map object is returned as a literal.
 
     // First, create the canonicalized key-value pair array.
     Array& key_value_array =
         Array::ZoneHandle(Array::New(kv_pairs_list.length(), Heap::kOld));
     Error& malformed_error = Error::Handle();
     for (int i = 0; i < kv_pairs_list.length(); i++) {
       AstNode* arg = kv_pairs_list[i];
       // Arguments have been evaluated to a literal value already.
       ASSERT(arg->IsLiteralNode());
+      ASSERT(!is_top_level_);  // We cannot check unresolved types.
       if (FLAG_enable_type_checks &&
           ((i % 2) == 1) &&  // Check values only, not keys.
           !value_type.IsDynamicType() &&
           (!arg->AsLiteralNode()->literal().IsNull() &&
            !arg->AsLiteralNode()->literal().IsInstanceOf(
                value_type, TypeArguments::Handle(), &malformed_error))) {
         // If the failure is due to a malformed type error, display it instead.
         if (!malformed_error.IsNull()) {
           ErrorMsg(malformed_error);
         } else {
@@ skipping 136 matching lines @@
   AbstractType& type = AbstractType::Handle(
       ParseType(ClassFinalizer::kCanonicalizeExpression));
   // In case the type is malformed, throw a dynamic type error after finishing
   // parsing the instance creation expression.
   if (!type.IsMalformed() && (type.IsTypeParameter() || type.IsDynamicType())) {
     // Replace the type with a malformed type.
     type = ClassFinalizer::NewFinalizedMalformedType(
         Error::Handle(),  // No previous error.
         current_class(),
         type_pos,
-        ClassFinalizer::kTryResolve,  // No compile-time error.
+        ClassFinalizer::kResolveTypeParameters,  // No compile-time error.
         "%s'%s' cannot be instantiated",
         type.IsTypeParameter() ? "type parameter " : "",
         type.IsTypeParameter() ?
             String::Handle(type.UserVisibleName()).ToCString() : "dynamic");
   }
 
   // The grammar allows for an optional ('.' identifier)? after the type, which
   // is a named constructor. Note that ParseType(kMustResolve) above will not
   // consume it as part of a misinterpreted qualified identifier, because only a
   // valid library prefix is accepted as qualifier.
@@ skipping 45 matching lines @@
     if (constructor.IsNull()) {
       const String& external_constructor_name =
           (named_constructor ? constructor_name : type_class_name);
       // Replace the type with a malformed type and compile a throw or report a
       // compile-time error if the constructor is const.
       if (is_const) {
         type = ClassFinalizer::NewFinalizedMalformedType(
             Error::Handle(),  // No previous error.
             current_class(),
             call_pos,
-            ClassFinalizer::kTryResolve,  // No compile-time error.
+            ClassFinalizer::kResolveTypeParameters,  // No compile-time error.
             "class '%s' has no constructor or factory named '%s'",
             String::Handle(type_class.Name()).ToCString(),
             external_constructor_name.ToCString());
         const Error& error = Error::Handle(type.malformed_error());
         ErrorMsg(error);
       }
       return ThrowNoSuchMethodError(call_pos,
                                     type_class,
                                     external_constructor_name,
                                     InvocationMirror::kConstructor,
@@ skipping 90 matching lines @@
                                      arguments));
     if (constructor_result.IsUnhandledException()) {
       new_object = GenerateRethrow(new_pos, constructor_result);
     } else {
       const Instance& const_instance = Instance::Cast(constructor_result);
       new_object = new LiteralNode(new_pos,
                                    Instance::ZoneHandle(const_instance.raw()));
       if (!type_bound.IsNull()) {
         ASSERT(!type_bound.IsMalformed());
         Error& malformed_error = Error::Handle();
+        ASSERT(!is_top_level_);  // We cannot check unresolved types.
         if (!const_instance.IsInstanceOf(type_bound,
                                          TypeArguments::Handle(),
                                          &malformed_error)) {
           type_bound = ClassFinalizer::NewFinalizedMalformedType(
               malformed_error,
               current_class(),
               new_pos,
-              ClassFinalizer::kTryResolve,  // No compile-time error.
+              ClassFinalizer::kResolveTypeParameters,  // No compile-time error.
               "const factory result is not an instance of '%s'",
               String::Handle(type_bound.UserVisibleName()).ToCString());
           new_object = ThrowTypeError(new_pos, type_bound);
         }
         type_bound = AbstractType::null();
       }
     }
   } else {
     CheckConstructorCallTypeArguments(new_pos, constructor, type_arguments);
     if (!type_arguments.IsNull() &&
@@ skipping 562 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart