Skip to content

Commit 1b81c3d

Browse files
beccadaxbeccadax
committed
[NFC] Adopt ValueDecl * for decl_declared_here
1 parent fc2c66f commit 1b81c3d

19 files changed

+58
-73
lines changed

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ DIAG(REMARK,ID,Options,Text,Signature)
2727
#endif
2828

2929
NOTE(decl_declared_here,none,
30+
"%0 declared here", (const ValueDecl *))
31+
NOTE(decl_declared_here_base,none,
32+
"%base0 declared here", (const ValueDecl *))
33+
NOTE(name_declared_here,none,
3034
"%0 declared here", (DeclName))
3135
NOTE(kind_declared_here,none,
3236
"%0 declared here", (DescriptiveDeclKind))
3337
NOTE(descriptive_decl_declared_here,none,
3438
"'%0' declared here", (StringRef))
3539
NOTE(implicit_member_declared_here,none,
36-
"%1 '%0' is implicitly declared", (StringRef, StringRef))
40+
"%kindbase0 is implicitly declared", (const ValueDecl *))
3741
NOTE(extended_type_declared_here,none,
3842
"extended type declared here", ())
3943
NOTE(opaque_return_type_declared_here,none,
@@ -1043,7 +1047,7 @@ ERROR(cannot_find_type_in_scope,none,
10431047
ERROR(cannot_find_type_in_scope_did_you_mean,none,
10441048
"cannot find type %0 in scope; did you mean to use '%1'?", (DeclNameRef, StringRef))
10451049
NOTE(note_typo_candidate_implicit_member,none,
1046-
"did you mean the implicitly-synthesized %1 '%0'?", (StringRef, StringRef))
1050+
"did you mean the implicitly-synthesized %kindbase0?", (const ValueDecl *))
10471051
NOTE(note_remapped_type,none,
10481052
"did you mean to use '%0'?", (StringRef))
10491053
NOTE(note_module_as_type,none,

‎lib/AST/RequirementMachine/RequirementLowering.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ TypeAliasRequirementsRequest::evaluate(Evaluator &evaluator,
10201020
.fixItRemove(assocTypeDecl->getSourceRange());
10211021

10221022
ctx.Diags.diagnose(inheritedAssocTypeDecl, diag::decl_declared_here,
1023-
inheritedAssocTypeDecl->getName());
1023+
inheritedAssocTypeDecl);
10241024

10251025
shouldWarnAboutRedeclaration = false;
10261026
}
@@ -1096,7 +1096,7 @@ TypeAliasRequirementsRequest::evaluate(Evaluator &evaluator,
10961096
getConcreteTypeReq(type, fixItWhere.Item))
10971097
.fixItRemove(type->getSourceRange());
10981098
ctx.Diags.diagnose(inheritedAssocTypeDecl, diag::decl_declared_here,
1099-
inheritedAssocTypeDecl->getName());
1099+
inheritedAssocTypeDecl);
11001100

11011101
shouldWarnAboutRedeclaration = false;
11021102
}

‎lib/Sema/CSApply.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4828,7 +4828,7 @@ namespace {
48284828
func->getDeclContext()->isModuleScopeContext(),
48294829
func->getName())
48304830
.highlight(subExpr->getSourceRange());
4831-
de.diagnose(func, diag::decl_declared_here, func->getName());
4831+
de.diagnose(func, diag::decl_declared_here, func);
48324832
return E;
48334833
}
48344834

@@ -4863,7 +4863,7 @@ namespace {
48634863
de.diagnose(E->getLoc(), diag::expr_selector_not_property,
48644864
isa<ParamDecl>(var), var->getName())
48654865
.highlight(subExpr->getSourceRange());
4866-
de.diagnose(var, diag::decl_declared_here, var->getName());
4866+
de.diagnose(var, diag::decl_declared_here, var);
48674867
return E;
48684868
}
48694869

@@ -4915,15 +4915,15 @@ namespace {
49154915
if (!var->isSettable(dc)) {
49164916
de.diagnose(E->getLoc(), diag::expr_selector_property_not_settable,
49174917
var);
4918-
de.diagnose(var, diag::decl_declared_here, var->getName());
4918+
de.diagnose(var, diag::decl_declared_here, var);
49194919
return E;
49204920
}
49214921

49224922
// Make sure the setter is accessible.
49234923
if (!var->isSetterAccessibleFrom(dc)) {
49244924
de.diagnose(E->getLoc(),
49254925
diag::expr_selector_property_setter_inaccessible, var);
4926-
de.diagnose(var, diag::decl_declared_here, var->getName());
4926+
de.diagnose(var, diag::decl_declared_here, var);
49274927
return E;
49284928
}
49294929

@@ -4934,8 +4934,7 @@ namespace {
49344934
// Cannot reference with #selector.
49354935
de.diagnose(E->getLoc(), diag::expr_selector_no_declaration)
49364936
.highlight(subExpr->getSourceRange());
4937-
de.diagnose(foundDecl, diag::decl_declared_here,
4938-
foundDecl->getName());
4937+
de.diagnose(foundDecl, diag::decl_declared_here, foundDecl);
49394938
return E;
49404939
}
49414940
assert(method && "Didn't find a method?");

‎lib/Sema/CSDiagnostics.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,8 +1867,7 @@ bool RValueTreatedAsLValueFailure::diagnoseAsError() {
18671867
if (auto overload = getOverloadChoiceIfAvailable(
18681868
getConstraintLocator(member, ConstraintLocator::Member))) {
18691869
if (auto *ref = overload->choice.getDeclOrNull())
1870-
emitDiagnosticAt(ref, diag::decl_declared_here,
1871-
ref->getName());
1870+
emitDiagnosticAt(ref, diag::decl_declared_here, ref);
18721871
}
18731872
return true;
18741873
}
@@ -5063,7 +5062,7 @@ bool MissingArgumentsFailure::diagnoseAsError() {
50635062

50645063
if (auto selectedOverload = getCalleeOverloadChoiceIfAvailable(locator)) {
50655064
if (auto *decl = selectedOverload->choice.getDeclOrNull()) {
5066-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
5065+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
50675066
}
50685067
}
50695068

@@ -5231,7 +5230,7 @@ bool MissingArgumentsFailure::diagnoseSingleMissingArgument() const {
52315230
if (auto selectedOverload =
52325231
getCalleeOverloadChoiceIfAvailable(getLocator())) {
52335232
if (auto *decl = selectedOverload->choice.getDeclOrNull()) {
5234-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
5233+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
52355234
}
52365235
}
52375236

@@ -5377,7 +5376,7 @@ bool MissingArgumentsFailure::diagnoseInvalidTupleDestructuring() const {
53775376
diagnostic.flush();
53785377

53795378
// Add a note which points to the overload choice location.
5380-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
5379+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
53815380
return true;
53825381
}
53835382

@@ -5867,7 +5866,7 @@ bool ExtraneousArgumentsFailure::diagnoseAsError() {
58675866

58685867
if (auto overload = getCalleeOverloadChoiceIfAvailable(getLocator())) {
58695868
if (auto *decl = overload->choice.getDeclOrNull()) {
5870-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
5869+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
58715870
}
58725871
}
58735872

@@ -5996,7 +5995,7 @@ bool InaccessibleMemberFailure::diagnoseAsError() {
59965995
.highlight(nameLoc.getSourceRange());
59975996
}
59985997

5999-
emitDiagnosticAt(Member, diag::decl_declared_here, Member->getName());
5998+
emitDiagnosticAt(Member, diag::decl_declared_here, Member);
60005999
return true;
60016000
}
60026001

@@ -7456,7 +7455,7 @@ bool ArgumentMismatchFailure::diagnoseTrailingClosureMismatch() const {
74567455

74577456
if (auto overload = getCalleeOverloadChoiceIfAvailable(getLocator())) {
74587457
if (auto *decl = overload->choice.getDeclOrNull()) {
7459-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
7458+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
74607459
}
74617460
}
74627461

@@ -8047,7 +8046,7 @@ bool MissingQualifierInMemberRefFailure::diagnoseAsError() {
80478046
choice->getDescriptiveKind(), qualifier)
80488047
.fixItInsert(UDE->getStartLoc(), namePlusDot);
80498048

8050-
emitDiagnosticAt(choice, diag::decl_declared_here, choice->getName());
8049+
emitDiagnosticAt(choice, diag::decl_declared_here, choice);
80518050
return true;
80528051
}
80538052

@@ -8275,7 +8274,7 @@ bool TrailingClosureRequiresExplicitLabel::diagnoseAsError() {
82758274
}
82768275

82778276
if (auto *callee = argInfo.getCallee()) {
8278-
emitDiagnosticAt(callee, diag::decl_declared_here, callee->getName());
8277+
emitDiagnosticAt(callee, diag::decl_declared_here, callee);
82798278
}
82808279

82818280
return true;
@@ -8473,7 +8472,7 @@ bool ReferenceToInvalidDeclaration::diagnoseAsError() {
84738472
// about reference to an invalid declaration.
84748473

84758474
emitDiagnostic(diag::reference_to_invalid_decl, decl->getName());
8476-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
8475+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
84778476
return true;
84788477
}
84798478

@@ -9101,7 +9100,7 @@ bool DestructureTupleToUseWithPackExpansionParameter::diagnoseAsError() {
91019100
return true;
91029101

91039102
if (auto *decl = selectedOverload->choice.getDeclOrNull()) {
9104-
emitDiagnosticAt(decl, diag::decl_declared_here, decl->getName());
9103+
emitDiagnosticAt(decl, diag::decl_declared_here, decl);
91059104
}
91069105

91079106
return true;

‎lib/Sema/ImportResolution.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ ScopedImportLookupRequest::evaluate(Evaluator &evaluator,
11921192

11931193
if (decls.size() == 1)
11941194
ctx.Diags.diagnose(decls.front(), diag::decl_declared_here,
1195-
decls.front()->getName());
1195+
decls.front());
11961196
}
11971197
return ctx.AllocateCopy(decls);
11981198
}

‎lib/Sema/MiscDiagnostics.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,7 @@ static void diagSyntacticUseRestrictions(const Expr *E, const DeclContext *DC,
601601
.fixItInsertAfter(arg->getEndLoc(), ")");
602602

603603
// Point to callee parameter
604-
Ctx.Diags.diagnose(calleeParam, diag::decl_declared_here,
605-
calleeParam->getName());
604+
Ctx.Diags.diagnose(calleeParam, diag::decl_declared_here, calleeParam);
606605
}
607606

608607
llvm::Optional<MagicIdentifierLiteralExpr::Kind>
@@ -785,7 +784,7 @@ static void diagSyntacticUseRestrictions(const Expr *E, const DeclContext *DC,
785784
VD->getBaseIdentifier(),
786785
VD->getDescriptiveKind(),
787786
declParent);
788-
Ctx.Diags.diagnose(VD, diag::decl_declared_here, VD->getName());
787+
Ctx.Diags.diagnose(VD, diag::decl_declared_here, VD);
789788

790789
if (VD->getDeclContext()->isTypeContext()) {
791790
Ctx.Diags.diagnose(DRE->getLoc(), diag::fix_unqualified_access_member)
@@ -2376,7 +2375,7 @@ static void diagnoseUnownedImmediateDeallocationImpl(ASTContext &ctx,
23762375
ctx.Diags.diagnose(diagLoc, diag::unowned_assignment_requires_strong)
23772376
.highlight(diagRange);
23782377

2379-
ctx.Diags.diagnose(varDecl, diag::decl_declared_here, varDecl->getName());
2378+
ctx.Diags.diagnose(varDecl, diag::decl_declared_here, varDecl);
23802379
}
23812380

23822381
void swift::diagnoseUnownedImmediateDeallocation(ASTContext &ctx,

‎lib/Sema/PreCheckExpr.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
483483
if (Lookup.outerResults().empty()) {
484484
Context.Diags.diagnose(Loc, diag::use_local_before_declaration, Name);
485485
Context.Diags.diagnose(innerDecl, diag::decl_declared_here,
486-
localDeclAfterUse->getName());
486+
localDeclAfterUse);
487487
Expr *error = new (Context) ErrorExpr(UDRE->getSourceRange());
488488
return error;
489489
}
@@ -528,7 +528,7 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
528528
// module we could offer a fix-it.
529529
for (auto lookupResult : inaccessibleResults) {
530530
auto *VD = lookupResult.getValueDecl();
531-
VD->diagnose(diag::decl_declared_here, VD->getName());
531+
VD->diagnose(diag::decl_declared_here, VD);
532532
}
533533

534534
// Don't try to recover here; we'll get more access-related diagnostics
@@ -796,7 +796,7 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
796796
Context.Diags.diagnose(Loc, diag::ambiguous_decl_ref, Name);
797797
for (auto Result : Lookup) {
798798
auto *Decl = Result.getValueDecl();
799-
Context.Diags.diagnose(Decl, diag::decl_declared_here, Decl->getName());
799+
Context.Diags.diagnose(Decl, diag::decl_declared_here, Decl);
800800
}
801801
return new (Context) ErrorExpr(UDRE->getSourceRange());
802802
}

‎lib/Sema/TypeCheckAccess.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2332,7 +2332,7 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
23322332
if (refRange.isValid())
23332333
diag.highlight(refRange);
23342334
diag.flush();
2335-
PGD->diagnose(diag::decl_declared_here, PGD->getName());
2335+
PGD->diagnose(diag::name_declared_here, PGD->getName());
23362336
}
23372337

23382338
void visitInfixOperatorDecl(InfixOperatorDecl *IOD) {

‎lib/Sema/TypeCheckAttr.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,14 +1484,14 @@ visitObjCImplementationAttr(ObjCImplementationAttr *attr) {
14841484
diag::attr_objc_implementation_must_extend_class,
14851485
ED->getExtendedNominal());
14861486
ED->getExtendedNominal()->diagnose(diag::decl_declared_here,
1487-
ED->getExtendedNominal()->getName());
1487+
ED->getExtendedNominal());
14881488
return;
14891489
}
14901490

14911491
if (!CD->hasClangNode()) {
14921492
diagnoseAndRemoveAttr(attr, diag::attr_objc_implementation_must_be_imported,
14931493
CD);
1494-
CD->diagnose(diag::decl_declared_here, CD->getName());
1494+
CD->diagnose(diag::decl_declared_here, CD);
14951495
return;
14961496
}
14971497

@@ -3972,7 +3972,7 @@ void AttributeChecker::visitCustomAttr(CustomAttr *attr) {
39723972
}
39733973

39743974
diagnose(attr->getLocation(), diag::nominal_type_not_attribute, nominal);
3975-
nominal->diagnose(diag::decl_declared_here, nominal->getName());
3975+
nominal->diagnose(diag::decl_declared_here, nominal);
39763976
attr->setInvalid();
39773977
}
39783978

@@ -5987,8 +5987,7 @@ static bool typeCheckDerivativeAttr(DerivativeAttr *attr) {
59875987
diags.diagnose(originalName.Loc,
59885988
diag::derivative_attr_original_stored_property_unsupported,
59895989
originalName.Name);
5990-
diags.diagnose(originalAFD->getLoc(), diag::decl_declared_here,
5991-
asd->getName());
5990+
diags.diagnose(originalAFD->getLoc(), diag::decl_declared_here, asd);
59925991
return true;
59935992
}
59945993
// Diagnose original class property and subscript setters.
@@ -5997,8 +5996,7 @@ static bool typeCheckDerivativeAttr(DerivativeAttr *attr) {
59975996
accessorDecl->getAccessorKind() == AccessorKind::Set) {
59985997
diags.diagnose(originalName.Loc,
59995998
diag::derivative_attr_class_setter_unsupported);
6000-
diags.diagnose(originalAFD->getLoc(), diag::decl_declared_here,
6001-
asd->getName());
5999+
diags.diagnose(originalAFD->getLoc(), diag::decl_declared_here, asd);
60026000
return true;
60036001
}
60046002
}
@@ -6875,8 +6873,7 @@ void AttributeChecker::visitMarkerAttr(MarkerAttr *attr) {
68756873
proto->diagnose(
68766874
diag::marker_protocol_inherit_nonmarker,
68776875
proto->getName(), inheritedProto->getName());
6878-
inheritedProto->diagnose(
6879-
diag::decl_declared_here, inheritedProto->getName());
6876+
inheritedProto->diagnose( diag::decl_declared_here, inheritedProto);
68806877
}
68816878
}
68826879

@@ -7649,7 +7646,7 @@ ArrayRef<VarDecl *> InitAccessorReferencedVariablesRequest::evaluate(
76497646
DeclNameRef(name));
76507647

76517648
for (auto *choice : propertyResults) {
7652-
ctx.Diags.diagnose(choice, diag::decl_declared_here, choice->getName());
7649+
ctx.Diags.diagnose(choice, diag::decl_declared_here, choice);
76537650
}
76547651

76557652
failed = true;

‎lib/Sema/TypeCheckAvailability.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3571,16 +3571,14 @@ diagnoseDeclAsyncAvailability(const ValueDecl *D, SourceRange R,
35713571
if (const AbstractFunctionDecl *asyncAlt = afd->getAsyncAlternative()) {
35723572
SourceLoc diagLoc = call ? call->getLoc() : R.Start;
35733573
ctx.Diags.diagnose(diagLoc, diag::warn_use_async_alternative);
3574-
35753574
if (auto *accessor = dyn_cast<AccessorDecl>(asyncAlt)) {
35763575
SmallString<32> name;
35773576
llvm::raw_svector_ostream os(name);
35783577
accessor->printUserFacingName(os);
35793578
ctx.Diags.diagnose(asyncAlt->getLoc(),
35803579
diag::descriptive_decl_declared_here, name);
35813580
} else {
3582-
ctx.Diags.diagnose(asyncAlt->getLoc(), diag::decl_declared_here,
3583-
asyncAlt->getName());
3581+
asyncAlt->diagnose(diag::decl_declared_here, asyncAlt);
35843582
}
35853583
}
35863584
}
@@ -3610,7 +3608,7 @@ diagnoseDeclAsyncAvailability(const ValueDecl *D, SourceRange R,
36103608
ctx.Diags
36113609
.diagnose(diagLoc, diag::async_unavailable_decl, D, attr->Message)
36123610
.warnUntilSwiftVersion(6);
3613-
D->diagnose(diag::decl_declared_here, D->getName());
3611+
D->diagnose(diag::decl_declared_here, D);
36143612
return true;
36153613
}
36163614

0 commit comments

Comments
 (0)