Skip to content

Commit 4a126d7

Browse files
committed
pass a decl into diagnostic generation directly, instead of passing in the
decl loc, this simplifies code and can theoretically handle deserialized decls better. Noticed by inspection, NFC.
1 parent 043a85e commit 4a126d7

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Diff for: lib/Sema/TypeCheckConstraints.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE, DeclContext *DC) {
474474
assert(D->getDeclContext()->isLocalContext());
475475
if (!D->isInvalid()) {
476476
diagnose(Loc, diag::use_local_before_declaration, Name);
477-
diagnose(D->getLoc(), diag::decl_declared_here, Name);
477+
diagnose(D, diag::decl_declared_here, Name);
478478
}
479479
return new (Context) ErrorExpr(UDRE->getSourceRange());
480480
}

Diff for: lib/Sema/TypeCheckExpr.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -846,9 +846,7 @@ namespace {
846846

847847
TC.diagnose(NTD->getLoc(), diag::type_declared_here);
848848

849-
TC.diagnose(D->getLoc(), diag::decl_declared_here,
850-
D->getFullName());
851-
849+
TC.diagnose(D, diag::decl_declared_here, D->getFullName());
852850
return { false, DRE };
853851
}
854852
}
@@ -926,7 +924,7 @@ namespace {
926924
prevDecl = path;
927925
}
928926
}
929-
TC.diagnose(capturedDecl->getLoc(), diag::decl_declared_here,
927+
TC.diagnose(capturedDecl, diag::decl_declared_here,
930928
capturedDecl->getFullName());
931929
}
932930
return false;

0 commit comments

Comments
 (0)