Merge pull request #3297 from gregomni/crash28290

Author: swift-ci

lib/Sema/CSDiag.cpp

@@ -1025,8 +1025,8 @@ static bool findGenericSubstitutions(DeclContext *dc, Type paramType,
                                      Type actualArgType,
                                      TypeSubstitutionMap &archetypesMap) {
   // Type visitor doesn't handle unresolved types.
-  if (paramType->is<UnresolvedType>() ||
-      actualArgType->is<UnresolvedType>())
+  if (paramType->hasUnresolvedType() ||
+      actualArgType->hasUnresolvedType())
     return false;
 
   class GenericVisitor : public TypeMatcher<GenericVisitor> {

validation-test/compiler_crashers/28290-swift-constraints-constraintsystem-diagnosefailureforexpr.swift renamed to validation-test/compiler_crashers_fixed/28290-swift-constraints-constraintsystem-diagnosefailureforexpr.swift

@@ -5,6 +5,6 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -parse
+// RUN: not %target-swift-frontend %s -parse
 func a{{String($0}{u
 return{