[PATCH] D38940: Make x86 __ehhandler comdat if parent function is

[Dave Lee via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL316219: Make x86 __ehhandler comdat if parent function is (authored by kastiglione).

Repository:
  rL LLVM

https://reviews.llvm.org/D38940

Files:
  llvm/trunk/lib/Target/X86/X86WinEHState.cpp
  llvm/trunk/test/CodeGen/WinEH/wineh-comdat.ll


Index: llvm/trunk/test/CodeGen/WinEH/wineh-comdat.ll
===================================================================
--- llvm/trunk/test/CodeGen/WinEH/wineh-comdat.ll
+++ llvm/trunk/test/CodeGen/WinEH/wineh-comdat.ll
@@ -0,0 +1,17 @@
+; RUN: opt -mtriple=i686-unknown-windows-msvc -S -x86-winehstate < %s | FileCheck %s
+
+$f = comdat any
+
+define void @f() comdat personality i32 (...)* @__CxxFrameHandler3 {
+  invoke void @g() to label %return unwind label %unwind
+return:
+  ret void
+unwind:
+  %pad = cleanuppad within none []
+  cleanupret from %pad unwind to caller
+}
+
+declare void @g()
+declare i32 @__CxxFrameHandler3(...)
+
+; CHECK: define internal i32 @"__ehhandler$f"(i8*, i8*, i8*, i8*){{ .+}} comdat($f) {
Index: llvm/trunk/lib/Target/X86/X86WinEHState.cpp
===================================================================
--- llvm/trunk/lib/Target/X86/X86WinEHState.cpp
+++ llvm/trunk/lib/Target/X86/X86WinEHState.cpp
@@ -401,6 +401,8 @@
                        Twine("__ehhandler$") + GlobalValue::dropLLVMManglingEscape(
                                                    ParentFunc->getName()),
                        TheModule);
+  if (auto *C = ParentFunc->getComdat())
+    Trampoline->setComdat(C);
   BasicBlock *EntryBB = BasicBlock::Create(Context, "entry", Trampoline);
   IRBuilder<> Builder(EntryBB);
   Value *LSDA = emitEHLSDA(Builder, ParentFunc);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38940.119667.patch
Type: text/x-patch
Size: 1394 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171020/b52779f7/attachment.bin>