diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-02-13 02:18:36 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-02-13 02:18:36 +0000 |
commit | 22b19da9fc9f78e4e4097fa953b51be5961987b3 (patch) | |
tree | 96c3d58b681f37ee26a997d9ad1d33f1fa94978a | |
parent | 6eaf05a4fda7a8128c8fb6b891b4d3f1da3b4ef1 (diff) | |
download | bcm5719-llvm-22b19da9fc9f78e4e4097fa953b51be5961987b3.tar.gz bcm5719-llvm-22b19da9fc9f78e4e4097fa953b51be5961987b3.zip |
GlobalOpt: Aliases don't have sections, don't copy them when replacing
As defined in LangRef, aliases do not have sections. However, LLVM's
GlobalAlias class inherits from GlobalValue, which means we can read and
set its section. We should probably ban that as a separate change,
since it doesn't make much sense for an alias to have a section that
differs from its aliasee.
Fixes PR18757, where the section was being lost on the global in code
from Clang like:
extern "C" {
__attribute__((used, section("CUSTOM"))) static int in_custom_section;
}
Reviewers: rafael.espindola
Differential Revision: http://llvm-reviews.chandlerc.com/D2758
llvm-svn: 201286
-rw-r--r-- | llvm/lib/Transforms/IPO/GlobalOpt.cpp | 3 | ||||
-rw-r--r-- | llvm/test/Transforms/GlobalOpt/alias-resolve.ll | 5 | ||||
-rw-r--r-- | llvm/test/Transforms/GlobalOpt/alias-used-section.ll | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/IPO/GlobalOpt.cpp b/llvm/lib/Transforms/IPO/GlobalOpt.cpp index 50113069094..0381f8c180e 100644 --- a/llvm/lib/Transforms/IPO/GlobalOpt.cpp +++ b/llvm/lib/Transforms/IPO/GlobalOpt.cpp @@ -3018,7 +3018,8 @@ bool GlobalOpt::OptimizeGlobalAliases(Module &M) { // Give the aliasee the name, linkage and other attributes of the alias. Target->takeName(J); Target->setLinkage(J->getLinkage()); - Target->GlobalValue::copyAttributesFrom(J); + Target->setVisibility(J->getVisibility()); + Target->setDLLStorageClass(J->getDLLStorageClass()); if (Used.usedErase(J)) Used.usedInsert(Target); diff --git a/llvm/test/Transforms/GlobalOpt/alias-resolve.ll b/llvm/test/Transforms/GlobalOpt/alias-resolve.ll index 32f4bf8ebe2..5e229b94268 100644 --- a/llvm/test/Transforms/GlobalOpt/alias-resolve.ll +++ b/llvm/test/Transforms/GlobalOpt/alias-resolve.ll @@ -1,7 +1,4 @@ -; We use a temporary file so that the test fails when opt crashes. - -; RUN: opt < %s -globalopt -S > %t -; RUN: FileCheck %s < %t +; RUN: opt < %s -globalopt -S | FileCheck %s @foo1 = alias void ()* @foo2 ; CHECK: @foo1 = alias void ()* @foo2 diff --git a/llvm/test/Transforms/GlobalOpt/alias-used-section.ll b/llvm/test/Transforms/GlobalOpt/alias-used-section.ll new file mode 100644 index 00000000000..987c4a4926d --- /dev/null +++ b/llvm/test/Transforms/GlobalOpt/alias-used-section.ll @@ -0,0 +1,8 @@ +; RUN: opt -S -globalopt < %s | FileCheck %s + +@_Z17in_custom_section = internal global i8 42, section "CUSTOM" +@in_custom_section = protected dllexport alias internal i8* @_Z17in_custom_section + +; CHECK: @in_custom_section = internal protected dllexport global i8 42, section "CUSTOM" + +@llvm.used = appending global [1 x i8*] [i8* @in_custom_section], section "llvm.metadata" |