Merge pull request swiftlang#29491 from CodaFi/constraint-kinds

CodaFi · web-flow · commit c81cecf65399 · 2020-01-28T12:52:57.000-08:00
[GSB] Map invalid subject types in requirement constraints to ErrorType
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -4361,6 +4361,8 @@ ConstraintResult GenericSignatureBuilder::addTypeRequirement(
       
       if (subjectType->is<DependentMemberType>()) {
         subjectType = resolveDependentMemberTypes(*this, subjectType);
+      } else {
+        subjectType = ErrorType::get(subjectType);
       }
 
       auto invalidConstraint = Constraint<Type>(
diff --git a/validation-test/compiler_crashers_2_fixed/rdar58941114.swift b/validation-test/compiler_crashers_2_fixed/rdar58941114.swift
@@ -0,0 +1,6 @@
+// RUN: not %target-swift-frontend %s -typecheck
+
+class C {}
+protocol Foo {
+  associatedtype X where C: X
+}

Original file line number	Diff line number	Diff line change
`@@ -4361,6 +4361,8 @@ ConstraintResult GenericSignatureBuilder::addTypeRequirement(`
`4361`	`4361`
`4362`	`4362`	`if (subjectType->is<DependentMemberType>()) {`
`4363`	`4363`	`subjectType = resolveDependentMemberTypes(*this, subjectType);`
	`4364`	`+ } else {`
	`4365`	`+ subjectType = ErrorType::get(subjectType);`
`4364`	`4366`	`}`
`4365`	`4367`
`4366`	`4368`	`auto invalidConstraint = Constraint<Type>(`