[llvm-extract] Drop comdats from declarations

The verifier rejects comdats on declarations.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241483 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/IPO/ExtractGV.cpp b/lib/Transforms/IPO/ExtractGV.cpp
index 2f8c7d9349b9ccae813789497edcd9313ebe9b61..b9462f2ffc722d118d1f466e49700a6f648f20e4 100644 (file)
--- a/lib/Transforms/IPO/ExtractGV.cpp
+++ b/lib/Transforms/IPO/ExtractGV.cpp
@@ -93,8 +93,11 @@ namespace {
 
         makeVisible(*I, Delete);
 
 
         makeVisible(*I, Delete);
 

-        if (Delete)
+        if (Delete) {
+          // Make this a declaration and drop it's comdat.

           I->setInitializer(nullptr);
           I->setInitializer(nullptr);

+          I->setComdat(nullptr);
+        }

       }
 
       // Visit the Functions.
       }
 
       // Visit the Functions.


@@ -108,8 +111,11 @@ namespace {
 
         makeVisible(*I, Delete);
 
 
         makeVisible(*I, Delete);
 

-        if (Delete)
+        if (Delete) {
+          // Make this a declaration and drop it's comdat.

           I->deleteBody();
           I->deleteBody();

+          I->setComdat(nullptr);
+        }

       }
 
       // Visit the Aliases.
       }
 
       // Visit the Aliases.

diff --git a/test/Other/extract.ll b/test/Other/extract.ll
index 8b0c835d574660be93f29f29c45bcb72e48adfd8..08675d8bff318e58e9ef45f77d54f9e018307c4d 100644 (file)
--- a/test/Other/extract.ll
+++ b/test/Other/extract.ll
@@ -7,19 +7,22 @@
 ; llvm-extract uses lazy bitcode loading, so make sure it correctly reads
 ; from bitcode files in addition to assembly files.
 
 ; llvm-extract uses lazy bitcode loading, so make sure it correctly reads
 ; from bitcode files in addition to assembly files.
 

-; CHECK: define hidden void @foo() {
+; CHECK: define hidden void @foo() comdat($x) {

 ; CHECK:   ret void
 ; CHECK: }
 
 ; The private linkage for foo() should be changed to external linkage and
 ; hidden visibility added.
 ; DELETE: declare hidden void @foo()
 ; CHECK:   ret void
 ; CHECK: }
 
 ; The private linkage for foo() should be changed to external linkage and
 ; hidden visibility added.
 ; DELETE: declare hidden void @foo()

+; DELETE-NOT: comdat

 ; DELETE: define void @bar() {
 ; DELETE:   call void @foo()
 ; DELETE:   ret void
 ; DELETE: }
 
 ; DELETE: define void @bar() {
 ; DELETE:   call void @foo()
 ; DELETE:   ret void
 ; DELETE: }
 

-define private void @foo() {
+$x = comdat any
+
+define private void @foo() comdat($x) {

   ret void
 }
 define void @bar() {
   ret void
 }
 define void @bar() {