5 files changed, 101 insertions, 0 deletions
diff --git a/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp b/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
index cb735562fa6..886dac8314e 100644
--- a/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
+++ b/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
@@ -403,6 +403,12 @@ ModuleSummaryIndex llvm::buildModuleSummaryIndex(
                            CantBePromoted);
   }
 
+  // Set live flag for all personality functions. That allows to
+  // preserve them during DCE.
+  for (const llvm::Function &F : M)
+    if (!F.isDeclaration() && F.hasPersonalityFn())
+      setLiveRoot(Index, F.getPersonalityFn()->getName());
+
   // Compute summaries for all variables defined in module, and save in the
   // index.
   for (const GlobalVariable &G : M.globals()) {
diff --git a/llvm/test/ThinLTO/X86/Inputs/personality-local.ll b/llvm/test/ThinLTO/X86/Inputs/personality-local.ll
new file mode 100644
index 00000000000..dc27a375e1a
--- /dev/null
+++ b/llvm/test/ThinLTO/X86/Inputs/personality-local.ll
@@ -0,0 +1,6 @@
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-linux-gnu"
+
+define void @foo() {
+ ret void
+}
diff --git a/llvm/test/ThinLTO/X86/Inputs/personality.ll b/llvm/test/ThinLTO/X86/Inputs/personality.ll
new file mode 100644
index 00000000000..88c32cb11a2
--- /dev/null
+++ b/llvm/test/ThinLTO/X86/Inputs/personality.ll
@@ -0,0 +1,10 @@
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-linux-gnu"
+
+define void @bar() personality i32 (i32, i32, i64, i8*, i8*)* @personality_routine {
+ ret void
+}
+
+define protected i32 @personality_routine(i32, i32, i64, i8*, i8*) {
+  ret i32 0
+}
diff --git a/llvm/test/ThinLTO/X86/personality-local.ll b/llvm/test/ThinLTO/X86/personality-local.ll
new file mode 100644
index 00000000000..650e882a0cc
--- /dev/null
+++ b/llvm/test/ThinLTO/X86/personality-local.ll
@@ -0,0 +1,39 @@
+; RUN: opt -module-summary %s -o %t1.bc
+; RUN: opt -module-summary %S/Inputs/personality-local.ll -o %t2.bc
+
+; RUN: llvm-lto2 run -o %t.o %t1.bc %t2.bc -save-temps \
+; RUN:   -r %t2.bc,foo,p \
+; RUN:   -r %t1.bc,foo,l \
+; RUN:   -r %t1.bc,bar,p \
+; RUN:   -r %t1.bc,main,xp
+; RUN: llvm-readobj -t %t.o.1 | FileCheck %s
+
+; CHECK:      Symbol {
+; CHECK:        Name: foo
+; CHECK-NEXT:   Value: 0x0
+; CHECK-NEXT:   Size: 1
+; CHECK-NEXT:   Binding: Global
+; CHECK-NEXT:   Type: Function
+; CHECK-NEXT:   Other: 0
+; CHECK-NEXT:   Section: .text
+; CHECK-NEXT: }
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-linux-gnu"
+
+declare void @foo()
+
+define void @bar() personality i32 (i32, i32, i64, i8*, i8*)* @personality_routine {
+ ret void
+}
+
+define internal i32 @personality_routine(i32, i32, i64, i8*, i8*) {
+  call void @foo()
+  ret i32 0
+}
+
+define i32 @main() {
+  call void @bar()
+  ret i32 0
+}
+
diff --git a/llvm/test/ThinLTO/X86/personality.ll b/llvm/test/ThinLTO/X86/personality.ll
new file mode 100644
index 00000000000..4b77cb34f72
--- /dev/null
+++ b/llvm/test/ThinLTO/X86/personality.ll
@@ -0,0 +1,40 @@
+; RUN: opt -module-summary %s -o %t1.bc
+; RUN: opt -module-summary %S/Inputs/personality.ll -o %t2.bc
+
+; RUN: llvm-lto2 run -o %t.o %t1.bc %t2.bc -save-temps \
+; RUN:   -r %t2.bc,bar,p \
+; RUN:   -r %t2.bc,personality_routine,p \
+; RUN:   -r %t1.bc,foo,p \
+; RUN:   -r %t1.bc,personality_routine,l \
+; RUN:   -r %t1.bc,main,xp \
+; RUN:   -r %t1.bc,bar,l
+; RUN: llvm-readobj -t %t.o.1 | FileCheck %s --check-prefix=BINDING
+
+; BINDING:     Symbol {
+; BINDING:       Name: personality_routine
+; BINDING-NEXT:  Value:
+; BINDING-NEXT:  Size:
+; BINDING-NEXT:  Binding: Global
+; BINDING-NEXT:  Type: Function
+; BINDING-NEXT:  Other [
+; BINDING-NEXT:    STV_PROTECTED
+; BINDING-NEXT:  ]
+; BINDING-NEXT:  Section: .text
+; BINDING-NEXT: }
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-linux-gnu"
+
+declare protected i32 @personality_routine(i32, i32, i64, i8*, i8*)
+declare void @bar()
+
+define void @foo() personality i32 (i32, i32, i64, i8*, i8*)* @personality_routine {
+  ret void
+}
+
+define i32 @main() {
+  call void @foo()
+  call void @bar()
+  ret i32 0
+}
+