Skip to content

Commit cfbe86c

Browse files
committed
Remove getInternalLinkageFor
Commit 1283e98 added getInternalLinkageFor for ModuleInternalLinkage used by -fmodules-ts. Now that -fmodules-ts is removed, we can simplify the call sites to use LinkageInfo::internal().
1 parent 9e362e5 commit cfbe86c

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

clang/lib/AST/Decl.cpp

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,6 @@ static bool isDeclaredInModuleInterfaceOrPartition(const NamedDecl *D) {
606606
return false;
607607
}
608608

609-
static LinkageInfo getInternalLinkageFor(const NamedDecl *D) {
610-
return LinkageInfo::internal();
611-
}
612-
613609
static LinkageInfo getExternalLinkageFor(const NamedDecl *D) {
614610
return LinkageInfo::external();
615611
}
@@ -642,7 +638,7 @@ LinkageComputer::getLVForNamespaceScopeDecl(const NamedDecl *D,
642638
// - a variable, variable template, function, or function template
643639
// that is explicitly declared static; or
644640
// (This bullet corresponds to C99 6.2.2p3.)
645-
return getInternalLinkageFor(D);
641+
return LinkageInfo::internal();
646642
}
647643

648644
if (const auto *Var = dyn_cast<VarDecl>(D)) {
@@ -666,7 +662,7 @@ LinkageComputer::getLVForNamespaceScopeDecl(const NamedDecl *D,
666662
if (Var->getStorageClass() != SC_Extern &&
667663
Var->getStorageClass() != SC_PrivateExtern &&
668664
!isSingleLineLanguageLinkage(*Var))
669-
return getInternalLinkageFor(Var);
665+
return LinkageInfo::internal();
670666
}
671667

672668
for (const VarDecl *PrevVar = Var->getPreviousDecl(); PrevVar;
@@ -676,7 +672,7 @@ LinkageComputer::getLVForNamespaceScopeDecl(const NamedDecl *D,
676672
return getDeclLinkageAndVisibility(PrevVar);
677673
// Explicitly declared static.
678674
if (PrevVar->getStorageClass() == SC_Static)
679-
return getInternalLinkageFor(Var);
675+
return LinkageInfo::internal();
680676
}
681677
} else if (const auto *IFD = dyn_cast<IndirectFieldDecl>(D)) {
682678
// - a data member of an anonymous union.
@@ -700,7 +696,7 @@ LinkageComputer::getLVForNamespaceScopeDecl(const NamedDecl *D,
700696
// within an unnamed namespace has internal linkage.
701697
if ((!Var || !isFirstInExternCContext(Var)) &&
702698
(!Func || !isFirstInExternCContext(Func)))
703-
return getInternalLinkageFor(D);
699+
return LinkageInfo::internal();
704700
}
705701

706702
// Set up the defaults.
@@ -1312,11 +1308,11 @@ LinkageInfo LinkageComputer::getLVForLocalDecl(const NamedDecl *D,
13121308
if (const auto *Function = dyn_cast<FunctionDecl>(D)) {
13131309
if (Function->isInAnonymousNamespace() &&
13141310
!isFirstInExternCContext(Function))
1315-
return getInternalLinkageFor(Function);
1311+
return LinkageInfo::internal();
13161312

13171313
// This is a "void f();" which got merged with a file static.
13181314
if (Function->getCanonicalDecl()->getStorageClass() == SC_Static)
1319-
return getInternalLinkageFor(Function);
1315+
return LinkageInfo::internal();
13201316

13211317
LinkageInfo LV;
13221318
if (!hasExplicitVisibilityAlready(computation)) {
@@ -1335,7 +1331,7 @@ LinkageInfo LinkageComputer::getLVForLocalDecl(const NamedDecl *D,
13351331
if (const auto *Var = dyn_cast<VarDecl>(D)) {
13361332
if (Var->hasExternalStorage()) {
13371333
if (Var->isInAnonymousNamespace() && !isFirstInExternCContext(Var))
1338-
return getInternalLinkageFor(Var);
1334+
return LinkageInfo::internal();
13391335

13401336
LinkageInfo LV;
13411337
if (Var->getStorageClass() == SC_PrivateExtern)
@@ -1415,7 +1411,7 @@ LinkageInfo LinkageComputer::computeLVForDecl(const NamedDecl *D,
14151411
bool IgnoreVarTypeLinkage) {
14161412
// Internal_linkage attribute overrides other considerations.
14171413
if (D->hasAttr<InternalLinkageAttr>())
1418-
return getInternalLinkageFor(D);
1414+
return LinkageInfo::internal();
14191415

14201416
// Objective-C: treat all Objective-C declarations as having external
14211417
// linkage.
@@ -1473,7 +1469,7 @@ LinkageInfo LinkageComputer::computeLVForDecl(const NamedDecl *D,
14731469
if (Record->hasKnownLambdaInternalLinkage() ||
14741470
!Record->getLambdaManglingNumber()) {
14751471
// This lambda has no mangling number, so it's internal.
1476-
return getInternalLinkageFor(D);
1472+
return LinkageInfo::internal();
14771473
}
14781474

14791475
return getLVForClosure(
@@ -1532,7 +1528,7 @@ LinkageInfo LinkageComputer::getLVForDecl(const NamedDecl *D,
15321528
LVComputationKind computation) {
15331529
// Internal_linkage attribute overrides other considerations.
15341530
if (D->hasAttr<InternalLinkageAttr>())
1535-
return getInternalLinkageFor(D);
1531+
return LinkageInfo::internal();
15361532

15371533
if (computation.IgnoreAllVisibility && D->hasCachedLinkage())
15381534
return LinkageInfo(D->getCachedLinkage(), DefaultVisibility, false);

0 commit comments

Comments
 (0)