Merge pull request #13158 from DougGregor/type-checker-simplify-error-type

swift-ci · web-flow · commit 6c4ed9c3c2bc · 2017-11-29T17:05:32.000-08:00
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -1755,7 +1755,7 @@ Type simplifyTypeImpl(ConstraintSystem &cs, Type type, Fn getFixedTypeFn) {
             assocType->getDeclContext());
         auto result = assocType->getDeclaredInterfaceType().subst(subs);
 
-        if (result)
+        if (result && !result->hasError())
           return result;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -1755,7 +1755,7 @@ Type simplifyTypeImpl(ConstraintSystem &cs, Type type, Fn getFixedTypeFn) {`
`1755`	`1755`	`assocType->getDeclContext());`
`1756`	`1756`	`auto result = assocType->getDeclaredInterfaceType().subst(subs);`
`1757`	`1757`
`1758`		`- if (result)`
	`1758`	`+ if (result && !result->hasError())`
`1759`	`1759`	`return result;`
`1760`	`1760`	`}`
`1761`	`1761`