Merge pull request #6102 from benlangmuir/fix-032

[code-completion] Allow ErrorType in solution to avoid assertion failure

Author: benlangmuir

lib/Sema/TypeCheckConstraints.cpp

@@ -1630,10 +1630,14 @@ getTypeOfExpressionWithoutApplying(Expr *&expr, DeclContext *dc,
   auto &solution = viable[0];
   Type exprType = solution.simplifyType(*this, expr->getType());
 
-  assert(exprType && !exprType->hasError() && "erroneous solution?");
-  assert(!exprType->hasTypeVariable() &&
+  assert(exprType && !exprType->hasTypeVariable() &&
          "free type variable with FreeTypeVariableBinding::GenericParameters?");
 
+  if (exprType->hasError()) {
+    recoverOriginalType();
+    return None;
+  }
+
   // Dig the declaration out of the solution.
   auto semanticExpr = expr->getSemanticsProvidingExpr();
   auto topLocator = cs.getConstraintLocator(semanticExpr);

validation-test/IDE/crashers/108-swift-typechecker-typecheckcompletionsequence.swift

@@ -0,0 +1,3 @@
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+func c{case
+let a#^A^#}