commit 63aa2fbec61b9c31dd388bf54d92a1b42d34d959
author David Majnemer <david.majnemer@gmail.com> Tue Jun 30 21:23:51 2015 +0000
committer David Majnemer <david.majnemer@gmail.com> Tue Jun 30 21:23:51 2015 +0000
tree 0a028a59969d7785e17c63312e30a462b4cdebff
parent 9c41a93e24880289837cb387dc78dc643edc9ec6

[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

clang/lib/CodeGen/MicrosoftCXXABI.cpp

diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index afababe..d149df6 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -3732,6 +3732,8 @@
       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.