summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-06-30 21:23:51 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-06-30 21:23:51 +0000
commit63aa2fbec61b9c31dd388bf54d92a1b42d34d959 (patch)
tree0a028a59969d7785e17c63312e30a462b4cdebff /clang/lib/CodeGen
parent9c41a93e24880289837cb387dc78dc643edc9ec6 (diff)
downloadbcm5719-llvm-63aa2fbec61b9c31dd388bf54d92a1b42d34d959.tar.gz
bcm5719-llvm-63aa2fbec61b9c31dd388bf54d92a1b42d34d959.zip
[MS ABI] Stick constructor closures in an IR COMDAT group
We no-longer stick linkonce_odr entities in COMDATs in the backend. Instead, we rely on the IR COMDAT mechanism. llvm-svn: 241117
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/MicrosoftCXXABI.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index afababefa22..d149df63c9e 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -3732,6 +3732,8 @@ MicrosoftCXXABI::getAddrOfCXXCtorClosure(const CXXConstructorDecl *CD,
ThunkTy, getLinkageForRTTI(RecordTy), ThunkName.str(), &CGM.getModule());
ThunkFn->setCallingConv(static_cast<llvm::CallingConv::ID>(
FnInfo.getEffectiveCallingConvention()));
+ if (ThunkFn->isWeakForLinker())
+ ThunkFn->setComdat(CGM.getModule().getOrInsertComdat(ThunkFn->getName()));
bool IsCopy = CT == Ctor_CopyingClosure;
// Start codegen.
OpenPOWER on IntegriCloud