RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-03 22:01:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another llvm.ctors merging bug.

Browse Source 
We were not looking past casts to see if an element should be included
or not.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254313 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-11-30 18:54:24 +00:00
parent 8dc6e6c3bb
commit e87f0932d9
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Linker/LinkModules.cpp
View File

@ -410,7 +410,7 @@ class ModuleLinker {
std::vector<AppendingVarInfo> AppendingVars; std::vector<AppendingVarInfo> AppendingVars;
// Set of items not to link in from source. // Set of items not to link in from source.
SmallPtrSet<const Value *, 16> DoNotLinkFromSource; SmallPtrSet<const GlobalValue *, 16> DoNotLinkFromSource;
DiagnosticHandlerFunction DiagnosticHandler; DiagnosticHandlerFunction DiagnosticHandler;
@ -1512,7 +1512,8 @@ void ModuleLinker::linkAppendingVarInit(AppendingVarInfo &AVI) {
for (auto *V : SrcElements) { for (auto *V : SrcElements) {
if (IsNewStructor) { if (IsNewStructor) {
Constant *Key = V->getAggregateElement(2); auto *Key =
dyn_cast<GlobalValue>(V->getAggregateElement(2)->stripPointerCasts());
if (DoNotLinkFromSource.count(Key)) if (DoNotLinkFromSource.count(Key))
continue; continue;
} }

7
test/Linker/Inputs/ctors3.ll Normal file
View File

@ -0,0 +1,7 @@
$foo = comdat any
%t = type { i8 }
@foo = global %t zeroinitializer, comdat
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @bar, i8* getelementptr (%t, %t* @foo, i32 0, i32 0) }]
define internal void @bar() comdat($foo) {
ret void
}

8
test/Linker/ctors3.ll Normal file
View File

@ -0,0 +1,8 @@
; RUN: llvm-link -S %s %p/Inputs/ctors3.ll -o - | FileCheck %s
$foo = comdat any
%t = type { i8 }
@foo = global %t zeroinitializer, comdat
; CHECK: @foo = global %t zeroinitializer, comdat
; CHECK: @llvm.global_ctors = appending global [0 x { i32, void ()*, i8* }] zeroinitializer