Expand the unused warnings for functions. Warn for:
-static function declarations
-functions in anonymous namespace
-class methods in anonymous namespace
-class method specializations in anonymous namespace
-function specializations in anonymous namespace
llvm-svn: 111026
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index f5c85ad..76e0591 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -235,6 +235,24 @@
void Sema::DeleteStmt(StmtTy *S) {
}
+/// \brief Used to prune the decls of Sema's UnusedFileScopedDecls vector.
+static bool ShouldRemoveFromUnused(Sema *SemaRef, const DeclaratorDecl *D) {
+ if (D->isUsed())
+ return true;
+
+ if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
+ // For functions, UnusedFileScopedDecls stores the first declaration.
+ // Later redecls may add new information resulting in not having to warn,
+ // so check again.
+ const FunctionDecl *DeclToCheck;
+ if (!FD->hasBody(DeclToCheck))
+ DeclToCheck = FD->getMostRecentDeclaration();
+ if (DeclToCheck != FD)
+ return !SemaRef->ShouldWarnIfUnusedFileScopedDecl(DeclToCheck);
+ }
+ return false;
+}
+
/// ActOnEndOfTranslationUnit - This is called at the very end of the
/// translation unit when EOF is reached and all but the top-level scope is
/// popped.
@@ -263,10 +281,10 @@
}
// Remove file scoped decls that turned out to be used.
- UnusedFileScopedDecls.erase(std::remove_if(UnusedFileScopedDecls.begin(),
- UnusedFileScopedDecls.end(),
- std::bind2nd(std::mem_fun(&DeclaratorDecl::isUsed),
- true)),
+ UnusedFileScopedDecls.erase(std::remove_if(UnusedFileScopedDecls.begin(),
+ UnusedFileScopedDecls.end(),
+ std::bind1st(std::ptr_fun(ShouldRemoveFromUnused),
+ this)),
UnusedFileScopedDecls.end());
if (!CompleteTranslationUnit)
@@ -334,9 +352,13 @@
for (std::vector<const DeclaratorDecl*>::iterator
I = UnusedFileScopedDecls.begin(),
E = UnusedFileScopedDecls.end(); I != E; ++I) {
- if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(*I))
- Diag(FD->getLocation(), diag::warn_unused_function) << FD->getDeclName();
- else
+ if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(*I)) {
+ const FunctionDecl *DiagD;
+ if (!FD->hasBody(DiagD))
+ DiagD = FD;
+ Diag(DiagD->getLocation(), diag::warn_unused_function)
+ << DiagD->getDeclName();
+ } else
Diag((*I)->getLocation(), diag::warn_unused_variable)
<< cast<VarDecl>(*I)->getDeclName();
}
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index e1f9c82..cf6f20f 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -521,25 +521,40 @@
F.done();
}
-static bool ShouldWarnIfUnusedFileScopedDecl(const DeclaratorDecl *D) {
- if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
- // Warn for static, non-inlined function definitions that
- // have not been used.
- // FIXME: Also include static functions declared but not defined.
- return (!FD->isInvalidDecl()
- && !FD->isInlined() && FD->getLinkage() == InternalLinkage
- && !FD->isUsed() && !FD->hasAttr<UnusedAttr>()
- && !FD->hasAttr<ConstructorAttr>()
- && !FD->hasAttr<DestructorAttr>());
- }
-
- return false;
-}
+bool Sema::ShouldWarnIfUnusedFileScopedDecl(const DeclaratorDecl *D) const {
+ assert(D);
+ if (D->isInvalidDecl() || D->isUsed() || D->hasAttr<UnusedAttr>())
+ return false;
+ if (D->getLinkage() == ExternalLinkage)
+ return false;
-void Sema::MarkUnusedFileScopedDecl(const DeclaratorDecl *D) {
- if (ShouldWarnIfUnusedFileScopedDecl(D))
- UnusedFileScopedDecls.push_back(D);
-}
+ // Ignore class templates.
+ if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D))
+ if (MD->getParent()->getDescribedClassTemplate())
+ return false;
+
+ if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
+ if (FD->isThisDeclarationADefinition())
+ return !Context.DeclMustBeEmitted(FD);
+ return true;
+ }
+
+ return false;
+ }
+
+ void Sema::MarkUnusedFileScopedDecl(const DeclaratorDecl *D) {
+ if (!D)
+ return;
+
+ if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
+ const FunctionDecl *First = FD->getFirstDeclaration();
+ if (FD != First && ShouldWarnIfUnusedFileScopedDecl(First))
+ return; // First should already be in the vector.
+ }
+
+ if (ShouldWarnIfUnusedFileScopedDecl(D))
+ UnusedFileScopedDecls.push_back(D);
+ }
static bool ShouldDiagnoseUnusedDecl(const NamedDecl *D) {
if (D->isInvalidDecl())
@@ -3638,8 +3653,7 @@
if (FunctionTemplate)
return FunctionTemplate;
- if (IsFunctionDefinition)
- MarkUnusedFileScopedDecl(NewFD);
+ MarkUnusedFileScopedDecl(NewFD);
return NewFD;
}
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index fd630f2..a48f1e0 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1204,6 +1204,8 @@
PrincipalDecl->isInIdentifierNamespace(Decl::IDNS_Ordinary))
PrincipalDecl->setNonMemberOperator();
+ SemaRef.MarkUnusedFileScopedDecl(Function);
+
return Function;
}
@@ -1415,6 +1417,8 @@
else
Owner->addDecl(DeclToAdd);
}
+
+ SemaRef.MarkUnusedFileScopedDecl(Method);
return Method;
}