diff options
| -rw-r--r-- | lib/AST/DeclBase.cpp | 7 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp index 7b20e7751a..b04c149dee 100644 --- a/lib/AST/DeclBase.cpp +++ b/lib/AST/DeclBase.cpp @@ -261,13 +261,6 @@ bool Decl::isUsed(bool CheckUsedAttr) const { if (CheckUsedAttr && hasAttr<UsedAttr>()) return true; - // Check redeclarations. We merge attributes, so we don't need to check - // attributes in all redeclarations. - for (redecl_iterator I = redecls_begin(), E = redecls_end(); I != E; ++I) { - if (I->Used) - return true; - } - return false; } diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 629fccc306..6a9065e94f 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2388,6 +2388,10 @@ bool Sema::MergeCompatibleFunctionDecls(FunctionDecl *New, FunctionDecl *Old, if (Old->isPure()) New->setPure(); + // Merge "used" flag. + if (Old->isUsed(false)) + New->setUsed(); + // Merge attributes from the parameters. These can mismatch with K&R // declarations. if (New->getNumParams() == Old->getNumParams()) @@ -2613,6 +2617,10 @@ void Sema::MergeVarDecl(VarDecl *New, LookupResult &Previous) { New->getDeclContext() == Old->getDeclContext()) New->setStorageClass(Old->getStorageClass()); + // Merge "used" flag. + if (Old->isUsed(false)) + New->setUsed(); + // Keep a chain of previous declarations. New->setPreviousDeclaration(Old); |