Skip to content

Commit d68388c

Browse files
committed
Sema: Move conformance checking PrettyStackTrace to a better place
Not all conformance checking goes through checkConformance() so we were losing useful information in some backtraces.
1 parent c84553c commit d68388c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,6 +1623,8 @@ static void diagnoseConformanceImpliedByConditionalConformance(
16231623
ProtocolConformance *MultiConformanceChecker::
16241624
checkIndividualConformance(NormalProtocolConformance *conformance,
16251625
bool issueFixit) {
1626+
PrettyStackTraceConformance trace(TC.Context, "type-checking", conformance);
1627+
16261628
std::vector<ValueDecl*> revivedMissingWitnesses;
16271629
switch (conformance->getState()) {
16281630
case ProtocolConformanceState::Incomplete:
@@ -4392,8 +4394,6 @@ void TypeChecker::useBridgedNSErrorConformances(DeclContext *dc, Type type) {
43924394
}
43934395

43944396
void TypeChecker::checkConformance(NormalProtocolConformance *conformance) {
4395-
PrettyStackTraceConformance trace(Context, "type-checking", conformance);
4396-
43974397
MultiConformanceChecker checker(*this);
43984398
checker.addConformance(conformance);
43994399
checker.checkAllConformances();

0 commit comments

Comments
 (0)