Quick check for self in InterfaceTypeImpl.getLeastUpperBound()

pkg/analyzer_experimental/lib/src/generated/resolver.dart

Index: pkg/analyzer_experimental/lib/src/generated/resolver.dart
diff --git a/pkg/analyzer_experimental/lib/src/generated/resolver.dart b/pkg/analyzer_experimental/lib/src/generated/resolver.dart
index 5e64ea1f9340982b330f0adf8af786a16788b25a..e0a4a74f78400f5975c48882262c66adca5efa55 100644
--- a/pkg/analyzer_experimental/lib/src/generated/resolver.dart
+++ b/pkg/analyzer_experimental/lib/src/generated/resolver.dart
@@ -8026,6 +8026,8 @@ class TypeResolverVisitor extends ScopedVisitor {
         reportError(StaticWarningCode.CAST_TO_NON_TYPE, typeName, [typeName.name]);
       } else if (isTypeNameInIsExpression(node)) {
         reportError(StaticWarningCode.TYPE_TEST_NON_TYPE, typeName, [typeName.name]);
+      } else if (isTypeNameTargetInRedirectedConstructor(node)) {
+        reportError(StaticWarningCode.REDIRECT_TO_NON_CLASS, typeName, [typeName.name]);
       } else {
         reportError(StaticWarningCode.UNDEFINED_CLASS, typeName, [typeName.name]);
       }
@@ -8318,6 +8320,24 @@ class TypeResolverVisitor extends ScopedVisitor {
   }
 
   /**
+   * Checks if the given type name is the target in a redirected constructor.
+   * @param typeName the type name to analyzer
+   * @return {@code true} if the given type name is used as the type in a redirected constructor
+   */
+  bool isTypeNameTargetInRedirectedConstructor(TypeName typeName) {
+    ASTNode parent2 = typeName.parent;
+    if (parent2 is ConstructorName) {
+      ConstructorName constructorName = parent2 as ConstructorName;
+      parent2 = constructorName.parent;
+      if (parent2 is ConstructorDeclaration) {
+        ConstructorDeclaration constructorDeclaration = parent2 as ConstructorDeclaration;
+        return constructorName == constructorDeclaration.redirectedConstructor;
+      }
+    }
+    return false;
+  }
+
+  /**
    * Record that the static type of the given node is the given type.
    * @param expression the node whose type is to be recorded
    * @param type the static type of the node
@@ -9854,7 +9874,7 @@ class ErrorVerifier extends RecursiveASTVisitor<Object> {
       checkForMultipleSuperInitializers(node);
       checkForRecursiveConstructorRedirect(node);
       checkForRecursiveFactoryRedirect(node);
-      checkForRedirectToInvalidFunction(node);
+      checkForAllRedirectConstructorErrorCodes(node);
       checkForUndefinedConstructorInInitializerImplicit(node);
       checkForRedirectToNonConstConstructor(node);
       return super.visitConstructorDeclaration(node);
@@ -10380,6 +10400,48 @@ class ErrorVerifier extends RecursiveASTVisitor<Object> {
   }
 
   /**
+   * This checks error related to the redirected constructors.
+   * @param node the constructor declaration to evaluate
+   * @return {@code true} if and only if an error code is generated on the passed node
+   * @see StaticWarningCode#REDIRECT_TO_INVALID_RETURN_TYPE
+   * @see StaticWarningCode#REDIRECT_TO_INVALID_FUNCTION_TYPE
+   * @see StaticWarningCode#REDIRECT_TO_MISSING_CONSTRUCTOR
+   */
+  bool checkForAllRedirectConstructorErrorCodes(ConstructorDeclaration node) {
+    ConstructorName redirectedNode = node.redirectedConstructor;
+    if (redirectedNode == null) {
+      return false;
+    }
+    ConstructorElement redirectedElement = redirectedNode.element;
+    if (redirectedElement == null) {
+      TypeName constructorTypeName = redirectedNode.type;
+      Type2 redirectedType = constructorTypeName.type;
+      if (redirectedType != null && redirectedType.element != null && redirectedType.element != DynamicElementImpl.instance) {
+        String constructorStrName = constructorTypeName.name.name;
+        if (redirectedNode.name != null) {
+          constructorStrName += ".${redirectedNode.name.name}";
+        }
+        _errorReporter.reportError2(StaticWarningCode.REDIRECT_TO_MISSING_CONSTRUCTOR, redirectedNode, [constructorStrName, redirectedType.displayName]);
+        return true;
+      }
+      return false;
+    }
+    FunctionType redirectedType = redirectedElement.type;
+    Type2 redirectedReturnType = redirectedType.returnType;
+    FunctionType constructorType = node.element.type;
+    Type2 constructorReturnType = constructorType.returnType;
+    if (!redirectedReturnType.isSubtypeOf(constructorReturnType)) {
+      _errorReporter.reportError2(StaticWarningCode.REDIRECT_TO_INVALID_RETURN_TYPE, redirectedNode, [redirectedReturnType, constructorReturnType]);
+      return true;
+    }
+    if (!redirectedType.isSubtypeOf(constructorType)) {
+      _errorReporter.reportError2(StaticWarningCode.REDIRECT_TO_INVALID_FUNCTION_TYPE, redirectedNode, [redirectedType, constructorType]);
+      return true;
+    }
+    return false;
+  }
+
+  /**
    * This checks that the return statement of the form <i>return e;</i> is not in a generative
    * constructor.
    * <p>
@@ -12144,38 +12206,6 @@ class ErrorVerifier extends RecursiveASTVisitor<Object> {
   }
 
   /**
-   * This checks if the passed constructor declaration has redirected constructor with compatible
-   * function type.
-   * @param node the constructor declaration to evaluate
-   * @return {@code true} if and only if an error code is generated on the passed node
-   * @see StaticWarningCode#REDIRECT_TO_INVALID_RETURN_TYPE
-   * @see StaticWarningCode#REDIRECT_TO_INVALID_FUNCTION_TYPE
-   */
-  bool checkForRedirectToInvalidFunction(ConstructorDeclaration node) {
-    ConstructorName redirectedNode = node.redirectedConstructor;
-    if (redirectedNode == null) {
-      return false;
-    }
-    ConstructorElement redirectedElement = redirectedNode.element;
-    if (redirectedElement == null) {
-      return false;
-    }
-    FunctionType redirectedType = redirectedElement.type;
-    Type2 redirectedReturnType = redirectedType.returnType;
-    FunctionType constructorType = node.element.type;
-    Type2 constructorReturnType = constructorType.returnType;
-    if (!redirectedReturnType.isSubtypeOf(constructorReturnType)) {
-      _errorReporter.reportError2(StaticWarningCode.REDIRECT_TO_INVALID_RETURN_TYPE, redirectedNode, [redirectedReturnType, constructorReturnType]);
-      return true;
-    }
-    if (!redirectedType.isSubtypeOf(constructorType)) {
-      _errorReporter.reportError2(StaticWarningCode.REDIRECT_TO_INVALID_FUNCTION_TYPE, redirectedNode, [redirectedType, constructorType]);
-      return true;
-    }
-    return false;
-  }
-
-  /**
    * This checks if the passed constructor declaration has redirected constructor and references
    * itself directly or indirectly. TODO(scheglov)
    * @param node the constructor declaration to evaluate
@@ -12662,7 +12692,7 @@ class PubVerifier extends RecursiveASTVisitor<Object> {
    * @param path the path to be validated (not {@code null})
    * @return {@code true} if the import path contains ".."
    */
-  bool checkForPackageImportContainsDotDot(String path) => path.contains("/../");
+  bool checkForPackageImportContainsDotDot(String path) => path.startsWith("../") || path.contains("/../");
 
   /**
    * Answer the full name of the source associated with the compilation unit containing the given