Skip to content

Commit 6a74ad7

Browse files
committed
RequirementMachine: Drop GSB compatibility hack involving ErrorTypes
Another hack we can remove now that 'verify' mode skips checking if there was a conflict.
1 parent 226d2c8 commit 6a74ad7

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

lib/AST/RequirementMachine/RequirementLowering.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ static void desugarSameTypeRequirement(Type lhs, Type rhs, SourceLoc loc,
105105
}
106106
} matcher(loc, result, errors);
107107

108-
if (lhs->hasError() || rhs->hasError())
109-
return;
110-
111108
(void) matcher.match(lhs, rhs);
112109

113110
// If neither side is directly a type parameter, the type parameter

validation-test/compiler_crashers_2_fixed/0159-rdar40009245.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
protocol P {
44
associatedtype A : P where A.X == Self
5+
// expected-error@-1{{'X' is not a member type of type 'Self.A'}}
56
associatedtype X : P where P.A == Self
67
// expected-error@-1{{associated type 'A' can only be used with a concrete type or generic parameter base}}
78
}

0 commit comments

Comments
 (0)