Skip to content

Commit a05e072

Browse files
committed
[Diagnostics] Fix RequirementFailure::getConformanceForConditionalReq to use data from solution
1 parent 105c8f9 commit a05e072

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/Sema/CSDiagnostics.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ const Requirement &RequirementFailure::getRequirement() const {
183183

184184
ProtocolConformance *RequirementFailure::getConformanceForConditionalReq(
185185
ConstraintLocator *locator) {
186-
auto &cs = getConstraintSystem();
186+
auto &solution = getSolution();
187187
auto reqElt = locator->castLastElementTo<LocatorPathElt::AnyRequirement>();
188188
if (!reqElt.isConditionalRequirement())
189189
return nullptr;
@@ -192,10 +192,10 @@ ProtocolConformance *RequirementFailure::getConformanceForConditionalReq(
192192
auto *typeReqLoc = getConstraintLocator(getRawAnchor(), path.drop_back());
193193

194194
auto result = llvm::find_if(
195-
cs.CheckedConformances,
195+
solution.Conformances,
196196
[&](const std::pair<ConstraintLocator *, ProtocolConformanceRef>
197197
&conformance) { return conformance.first == typeReqLoc; });
198-
assert(result != cs.CheckedConformances.end());
198+
assert(result != solution.Conformances.end());
199199

200200
auto conformance = result->second;
201201
assert(conformance.isConcrete());

0 commit comments

Comments
 (0)