From edf017487ffdd52cd42f3129c0e6b78fffb31e89 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 23 Sep 2010 17:25:06 +0000 Subject: [PATCH] Fix llvm-extract so that it changes the linkage of all GlobalValues to "external" even when doing lazy bitcode loading. This was broken because a function that is not materialized fails the !isDeclaration() test. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114666 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/ExtractGV.cpp | 30 ++++++++++++++---------------- test/Other/extract.ll | 7 ++++++- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/lib/Transforms/IPO/ExtractGV.cpp b/lib/Transforms/IPO/ExtractGV.cpp index bb041697a5c..9d432de9fa7 100644 --- a/lib/Transforms/IPO/ExtractGV.cpp +++ b/lib/Transforms/IPO/ExtractGV.cpp @@ -50,24 +50,22 @@ namespace { // Visit the GlobalVariables. for (Module::global_iterator I = M.global_begin(), E = M.global_end(); - I != E; ++I) - if (!I->isDeclaration()) { - if (I->hasLocalLinkage()) - I->setVisibility(GlobalValue::HiddenVisibility); - I->setLinkage(GlobalValue::ExternalLinkage); - if (deleteStuff == (bool)Named.count(I)) - I->setInitializer(0); - } + I != E; ++I) { + if (I->hasLocalLinkage()) + I->setVisibility(GlobalValue::HiddenVisibility); + I->setLinkage(GlobalValue::ExternalLinkage); + if (deleteStuff == (bool)Named.count(I) && !I->isDeclaration()) + I->setInitializer(0); + } // Visit the Functions. - for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) - if (!I->isDeclaration()) { - if (I->hasLocalLinkage()) - I->setVisibility(GlobalValue::HiddenVisibility); - I->setLinkage(GlobalValue::ExternalLinkage); - if (deleteStuff == (bool)Named.count(I)) - I->deleteBody(); - } + for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) { + if (I->hasLocalLinkage()) + I->setVisibility(GlobalValue::HiddenVisibility); + I->setLinkage(GlobalValue::ExternalLinkage); + if (deleteStuff == (bool)Named.count(I) && !I->isDeclaration()) + I->deleteBody(); + } return true; } diff --git a/test/Other/extract.ll b/test/Other/extract.ll index 46962d094fd..57573ed76f9 100644 --- a/test/Other/extract.ll +++ b/test/Other/extract.ll @@ -10,13 +10,18 @@ ; CHECK: define void @foo() { ; CHECK: ret void ; CHECK: } + +; The linkonce_odr linkage for foo() should be changed to external linkage. +; DELETE: declare void @foo() ; DELETE: define void @bar() { +; DELETE: call void @foo() ; DELETE: ret void ; DELETE: } -define void @foo() { +define linkonce_odr void @foo() { ret void } define void @bar() { + call void @foo() ret void } -- 2.34.1