From 28f35758a58b6769ea6e4184fd2fc9368198a22a Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Wed, 18 Jan 2017 20:03:02 +0000
Subject: [PATCH] ThinLTOBitcodeWriter: Clear comdats on filtered globals.

Differential Revision: https://reviews.llvm.org/D28839

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@292431 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp   | 2 ++
 test/Transforms/ThinLTOBitcodeWriter/split.ll | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp b/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
index 30d91095c70..6ec69e32198 100644
--- a/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
+++ b/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
@@ -200,6 +200,7 @@ void filterModule(
       continue;
 
     F.deleteBody();
+    F.setComdat(nullptr);
     F.clearMetadata();
   }
 
@@ -209,6 +210,7 @@ void filterModule(
 
     GV.setInitializer(nullptr);
     GV.setLinkage(GlobalValue::ExternalLinkage);
+    GV.setComdat(nullptr);
     GV.clearMetadata();
   }
 
diff --git a/test/Transforms/ThinLTOBitcodeWriter/split.ll b/test/Transforms/ThinLTOBitcodeWriter/split.ll
index e08e92328b5..b86d7017c8b 100644
--- a/test/Transforms/ThinLTOBitcodeWriter/split.ll
+++ b/test/Transforms/ThinLTOBitcodeWriter/split.ll
@@ -12,9 +12,11 @@
 ; BCA0: <GLOBALVAL_SUMMARY_BLOCK
 ; BCA1-NOT: <GLOBALVAL_SUMMARY_BLOCK
 
+$g = comdat any
+
 ; M0: @g = external global i8{{$}}
-; M1: @g = global i8 42, !type !0
-@g = global i8 42, !type !0
+; M1: @g = global i8 42, comdat, !type !0
+@g = global i8 42, comdat, !type !0
 
 ; M0: define i8* @f()
 ; M1-NOT: @f()
-- 
2.50.0