Skip to content

Commit ac4ca6d

Browse files
committed
IRGen: Don't call getConditionalRequirementsIfAvailable()
We should not fail silently here if the conditional requirements could not be computed due to a cycle.
1 parent 8f30626 commit ac4ca6d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lib/IRGen/GenProto.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,12 +2737,8 @@ static void addAbstractConditionalRequirements(
27372737
SpecializedProtocolConformance *specializedConformance,
27382738
llvm::SetVector<GenericRequirement> &requirements) {
27392739
auto subMap = specializedConformance->getSubstitutionMap();
2740-
auto condRequirements =
2741-
specializedConformance->getConditionalRequirementsIfAvailable();
2742-
if (!condRequirements)
2743-
return;
2744-
2745-
for (auto req : *condRequirements) {
2740+
auto condRequirements = specializedConformance->getConditionalRequirements();
2741+
for (auto req : condRequirements) {
27462742
if (req.getKind() != RequirementKind::Conformance)
27472743
continue;
27482744
auto *proto =

0 commit comments

Comments
 (0)