diff options
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 0d6ba33aada..e72abb10a45 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1941,11 +1941,11 @@ CodeGenModule::GetLLVMLinkageVarDefinition(const VarDecl *D, bool isConstant) { Linkage == GVA_ExplicitTemplateInstantiation) return llvm::GlobalVariable::WeakODRLinkage; else if (!getLangOpts().CPlusPlus && - ((!CodeGenOpts.NoCommon && !D->getAttr<NoCommonAttr>()) || - D->getAttr<CommonAttr>()) && + ((!CodeGenOpts.NoCommon && !D->hasAttr<NoCommonAttr>()) || + D->hasAttr<CommonAttr>()) && !D->hasExternalStorage() && !D->getInit() && - !D->getAttr<SectionAttr>() && !D->getTLSKind() && - !D->getAttr<WeakImportAttr>()) { + !D->hasAttr<SectionAttr>() && !D->getTLSKind() && + !D->hasAttr<WeakImportAttr>()) { // Thread local vars aren't considered common linkage. return llvm::GlobalVariable::CommonLinkage; } else if (D->getTLSKind() == VarDecl::TLS_Dynamic && |
