aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/AST/Decl.cpp75
-rw-r--r--lib/AST/DeclBase.cpp32
-rw-r--r--lib/AST/DeclCXX.cpp2
-rw-r--r--lib/Serialization/ASTReaderDecl.cpp4
4 files changed, 109 insertions, 4 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 9664fe2684..19fbf69d37 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -526,7 +526,57 @@ static LinkageInfo getLVForClassMember(const NamedDecl *D, LVFlags F) {
}
LinkageInfo NamedDecl::getLinkageAndVisibility() const {
- return getLVForDecl(this, LVFlags());
+ // If we have already cached linkage and visibility, just return the
+ // cached information.
+ if (HasLinkageAndVisibilityCached) {
+#ifndef NDEBUG
+ LinkageInfo LI = getLVForDecl(this, LVFlags());
+ assert(LI.visibility() == CachedVisibility);
+ assert(LI.visibilityExplicit() == CachedVisibilityIsExplicit);
+ assert(LI.linkage() == CachedLinkage);
+#endif
+ return LinkageInfo(Linkage(CachedLinkage), Visibility(CachedVisibility),
+ CachedVisibilityIsExplicit);
+ }
+
+ LinkageInfo LI = getLVForDecl(this, LVFlags());
+ HasLinkageAndVisibilityCached = 1;
+ CachedVisibility = LI.visibility();
+ CachedVisibilityIsExplicit = LI.visibilityExplicit();
+ CachedLinkage = LI.linkage();
+ return LI;
+}
+
+void NamedDecl::ClearLinkageAndVisibilityCache() {
+ HasLinkageAndVisibilityCached = 0;
+
+ if (VarDecl *VD = dyn_cast<VarDecl>(this)) {
+ for (VarDecl::redecl_iterator R = VD->redecls_begin(),
+ REnd = VD->redecls_end();
+ R != REnd; ++R)
+ R->HasLinkageAndVisibilityCached = 0;
+
+ return;
+ }
+
+ if (FunctionDecl *FD = dyn_cast<FunctionDecl>(this)) {
+ for (FunctionDecl::redecl_iterator R = FD->redecls_begin(),
+ REnd = FD->redecls_end();
+ R != REnd; ++R)
+ R->HasLinkageAndVisibilityCached = 0;
+
+ return;
+ }
+
+ // Changing the linkage or visibility of a C++ class affect the linkage and
+ // visibility of all of its members. Clear their caches, too.
+ if (CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(this)) {
+ for (DeclContext::decl_iterator D = RD->decls_begin(),
+ DEnd = RD->decls_end();
+ D != DEnd; ++D)
+ if (NamedDecl *ND = dyn_cast<NamedDecl>(*D))
+ ND->ClearLinkageAndVisibilityCache();
+ }
}
static LinkageInfo getLVForDecl(const NamedDecl *D, LVFlags Flags) {
@@ -878,6 +928,14 @@ VarDecl *VarDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,
return new (C) VarDecl(Var, DC, L, Id, T, TInfo, S, SCAsWritten);
}
+void VarDecl::setStorageClass(StorageClass SC) {
+ assert(isLegalForVariable(SC));
+ if (SClass != SC)
+ ClearLinkageAndVisibilityCache();
+
+ SClass = SC;
+}
+
SourceLocation VarDecl::getInnerLocStart() const {
SourceLocation Start = getTypeSpecStartLoc();
if (Start.isInvalid())
@@ -1096,6 +1154,7 @@ void VarDecl::setTemplateSpecializationKind(TemplateSpecializationKind TSK,
PointOfInstantiation.isValid() &&
MSI->getPointOfInstantiation().isInvalid())
MSI->setPointOfInstantiation(PointOfInstantiation);
+ ClearLinkageAndVisibilityCache();
}
//===----------------------------------------------------------------------===//
@@ -1196,8 +1255,10 @@ Stmt *FunctionDecl::getBody(const FunctionDecl *&Definition) const {
void FunctionDecl::setBody(Stmt *B) {
Body = B;
- if (B)
+ if (B) {
EndRangeLoc = B->getLocEnd();
+ ClearLinkageAndVisibilityCache();
+ }
}
void FunctionDecl::setPure(bool P) {
@@ -1278,6 +1339,14 @@ FunctionDecl *FunctionDecl::getCanonicalDecl() {
return getFirstDeclaration();
}
+void FunctionDecl::setStorageClass(StorageClass SC) {
+ assert(isLegalForFunction(SC));
+ if (SClass != SC)
+ ClearLinkageAndVisibilityCache();
+
+ SClass = SC;
+}
+
/// \brief Returns a value indicating whether this function
/// corresponds to a builtin function.
///
@@ -1710,6 +1779,7 @@ FunctionDecl::setTemplateSpecializationKind(TemplateSpecializationKind TSK,
MSInfo->setPointOfInstantiation(PointOfInstantiation);
} else
assert(false && "Function cannot have a template specialization kind");
+ ClearLinkageAndVisibilityCache();
}
SourceLocation FunctionDecl::getPointOfInstantiation() const {
@@ -1788,6 +1858,7 @@ void TagDecl::setTypedefForAnonDecl(TypedefDecl *TDD) {
TypedefDeclOrQualifier = TDD;
if (TypeForDecl)
TypeForDecl->ClearLinkageCache();
+ ClearLinkageAndVisibilityCache();
}
void TagDecl::startDefinition() {
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 843e907dea..3758ca1065 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -337,6 +337,38 @@ void Decl::dropAttrs() {
getASTContext().eraseDeclAttrs(this);
}
+void Decl::addAttr(Attr *A) {
+ if (NamedDecl *ND = dyn_cast<NamedDecl>(this))
+ if (VisibilityAttr *Visibility = dyn_cast<VisibilityAttr>(A)) {
+ bool ClearVisibility = true;
+ if (VarDecl *VD = dyn_cast<VarDecl>(this)) {
+ if (VD->getPreviousDeclaration()) {
+ VisibilityAttr *PrevVisibility
+ = VD->getPreviousDeclaration()->getAttr<VisibilityAttr>();
+ if (PrevVisibility &&
+ PrevVisibility->getVisibility() == Visibility->getVisibility())
+ ClearVisibility = false;
+ }
+ } else if (FunctionDecl *FD = dyn_cast<FunctionDecl>(this)) {
+ if (FD->getPreviousDeclaration()) {
+ VisibilityAttr *PrevVisibility
+ = FD->getPreviousDeclaration()->getAttr<VisibilityAttr>();
+ if (PrevVisibility &&
+ PrevVisibility->getVisibility() == Visibility->getVisibility())
+ ClearVisibility = false;
+ }
+ }
+
+ if (ClearVisibility)
+ ND->ClearLinkageAndVisibilityCache();
+ }
+
+ if (hasAttrs())
+ getAttrs().push_back(A);
+ else
+ setAttrs(AttrVec(1, A));
+}
+
const AttrVec &Decl::getAttrs() const {
assert(HasAttrs && "No attrs to get!");
return getASTContext().getDeclAttrs(this);
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 547a70a7a5..9e9b5ab7ea 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -792,6 +792,8 @@ CXXRecordDecl::setTemplateSpecializationKind(TemplateSpecializationKind TSK) {
}
if (MemberSpecializationInfo *MSInfo = getMemberSpecializationInfo()) {
+ if (MSInfo->getTemplateSpecializationKind() != TSK)
+ ClearLinkageAndVisibilityCache();
MSInfo->setTemplateSpecializationKind(TSK);
return;
}
diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index b1e46a623e..c21dfc2b1f 100644
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -383,7 +383,7 @@ void ASTDeclReader::VisitFunctionDecl(FunctionDecl *FD) {
// FunctionDecl's body is handled last at ASTDeclReader::Visit,
// after everything else is read.
- FD->setStorageClass((StorageClass)Record[Idx++]);
+ FD->SClass = (StorageClass)Record[Idx++];
FD->setStorageClassAsWritten((StorageClass)Record[Idx++]);
FD->setInlineSpecified(Record[Idx++]);
FD->setVirtualAsWritten(Record[Idx++]);
@@ -650,7 +650,7 @@ void ASTDeclReader::VisitIndirectFieldDecl(IndirectFieldDecl *FD) {
void ASTDeclReader::VisitVarDecl(VarDecl *VD) {
VisitDeclaratorDecl(VD);
VisitRedeclarable(VD);
- VD->setStorageClass((StorageClass)Record[Idx++]);
+ VD->SClass = (StorageClass)Record[Idx++];
VD->setStorageClassAsWritten((StorageClass)Record[Idx++]);
VD->setThreadSpecified(Record[Idx++]);
VD->setCXXDirectInitializer(Record[Idx++]);
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-04 17:47:56 +0000