diff options
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGRTTI.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGVtable.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGRTTI.cpp b/clang/lib/CodeGen/CGRTTI.cpp index a574703935c..a15ba4f2157 100644 --- a/clang/lib/CodeGen/CGRTTI.cpp +++ b/clang/lib/CodeGen/CGRTTI.cpp @@ -230,7 +230,7 @@ public: return llvm::ConstantExpr::getBitCast(GV, Int8PtrTy); // If we're in an anonymous namespace, then we always want internal linkage. - if (RD->isInAnonymousNamespace()) + if (RD->isInAnonymousNamespace() || !RD->hasLinkage()) Linkage = llvm::GlobalVariable::InternalLinkage; bool Hidden = CGM.getDeclVisibilityMode(RD) == LangOptions::Hidden; @@ -295,7 +295,7 @@ public: return DecideExtern(PT->getPointeeType()); if (const RecordType *RT = Ty->getAs<RecordType>()) if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl())) - return !RD->isInAnonymousNamespace(); + return !RD->isInAnonymousNamespace() && RD->hasLinkage(); return true; } diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp index 752f69c7c29..868a3414408 100644 --- a/clang/lib/CodeGen/CGVtable.cpp +++ b/clang/lib/CodeGen/CGVtable.cpp @@ -1458,7 +1458,7 @@ void CGVtableInfo::MaybeEmitVtable(GlobalDecl GD) { } llvm::GlobalVariable::LinkageTypes Linkage; - if (RD->isInAnonymousNamespace()) + if (RD->isInAnonymousNamespace() || !RD->hasLinkage()) Linkage = llvm::GlobalVariable::InternalLinkage; else if (KeyFunction && !MD->isInlined()) Linkage = llvm::GlobalVariable::ExternalLinkage; |
