Merge pull request #11339 from xedin/fix-skip-solutions-with-cache

swift-ci · web-flow · commit 43830625384a · 2017-08-04T13:32:10.000-07:00
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
@@ -1784,7 +1784,7 @@ Type TypeChecker::typeCheckExpression(Expr *&expr, DeclContext *dc,
 
   if (options.contains(TypeCheckExprFlags::SkipApplyingSolution)) {
     cleanup.disable();
-    return cs.getType(expr);
+    return solution.simplifyType(cs.getType(expr));
   }
 
   // Apply the solution to the expression.

Original file line number	Diff line number	Diff line change
`@@ -1784,7 +1784,7 @@ Type TypeChecker::typeCheckExpression(Expr &expr, DeclContext dc,`
`1784`	`1784`
`1785`	`1785`	`if (options.contains(TypeCheckExprFlags::SkipApplyingSolution)) {`
`1786`	`1786`	`cleanup.disable();`
`1787`		`- return cs.getType(expr);`
	`1787`	`+ return solution.simplifyType(cs.getType(expr));`
`1788`	`1788`	`}`
`1789`	`1789`
`1790`	`1790`	`// Apply the solution to the expression.`