diff options
| -rw-r--r-- | include/clang/AST/Decl.h | 7 | ||||
| -rw-r--r-- | lib/AST/Decl.cpp | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 7e966a0654..68d7d56585 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -800,6 +800,13 @@ public: getStorageClass() == SC_PrivateExtern; } + /// hasExternalStorageAsWritten - Returns true if a variable was written + /// with extern or __private_extern__ storage. + bool hasExternalStorageAsWritten() const { + return getStorageClassAsWritten() == SC_Extern || + getStorageClassAsWritten() == SC_PrivateExtern; + } + /// hasGlobalStorage - Returns true for all variables that do not /// have local storage. This includs all global variables as well /// as static variables declared within a function. diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index b8439cae74..257e59c237 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -1049,8 +1049,7 @@ static LinkageInfo getLVForLocalDecl(const NamedDecl *D, } if (const VarDecl *Var = dyn_cast<VarDecl>(D)) { - if (Var->getStorageClassAsWritten() == SC_Extern || - Var->getStorageClassAsWritten() == SC_PrivateExtern) { + if (Var->hasExternalStorageAsWritten()) { if (Var->isInAnonymousNamespace() && !Var->getDeclContext()->isExternCContext()) return LinkageInfo::uniqueExternal(); @@ -1600,9 +1599,8 @@ VarDecl::DefinitionKind VarDecl::isThisDeclarationADefinition( // AST for 'extern "C" int foo;' is annotated with 'extern'. if (hasExternalStorage()) return DeclarationOnly; - - if (getStorageClassAsWritten() == SC_Extern || - getStorageClassAsWritten() == SC_PrivateExtern) { + + if (hasExternalStorageAsWritten()) { for (const VarDecl *PrevVar = getPreviousDecl(); PrevVar; PrevVar = PrevVar->getPreviousDecl()) { if (PrevVar->getLinkage() == InternalLinkage) |