[llvm] r342858 - Fix asserts when linking wrong address space declarations
Matt Arsenault via llvm-commits
llvm-commits at lists.llvm.org
Sun Sep 23 21:42:14 PDT 2018
Author: arsenm
Date: Sun Sep 23 21:42:14 2018
New Revision: 342858
URL: http://llvm.org/viewvc/llvm-project?rev=342858&view=rev
Log:
Fix asserts when linking wrong address space declarations
Added:
llvm/trunk/test/Linker/Inputs/wrong-addrspace-gv-declaration.ll
llvm/trunk/test/Linker/wrong-addrspace-gv-declaration.ll
Modified:
llvm/trunk/lib/Linker/IRMover.cpp
Modified: llvm/trunk/lib/Linker/IRMover.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/IRMover.cpp?rev=342858&r1=342857&r2=342858&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/IRMover.cpp (original)
+++ llvm/trunk/lib/Linker/IRMover.cpp Sun Sep 23 21:42:14 2018
@@ -978,11 +978,14 @@ Expected<Constant *> IRLinker::linkGloba
// containing a GV from the source module, in which case SGV will be
// the same as DGV and NewGV, and TypeMap.get() will assert since it
// assumes it is being invoked on a type in the source module.
- if (DGV && NewGV != SGV)
- C = ConstantExpr::getBitCast(NewGV, TypeMap.get(SGV->getType()));
+ if (DGV && NewGV != SGV) {
+ C = ConstantExpr::getPointerBitCastOrAddrSpaceCast(
+ NewGV, TypeMap.get(SGV->getType()));
+ }
if (DGV && NewGV != DGV) {
- DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewGV, DGV->getType()));
+ DGV->replaceAllUsesWith(
+ ConstantExpr::getPointerBitCastOrAddrSpaceCast(NewGV, DGV->getType()));
DGV->eraseFromParent();
}
Added: llvm/trunk/test/Linker/Inputs/wrong-addrspace-gv-declaration.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/wrong-addrspace-gv-declaration.ll?rev=342858&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/wrong-addrspace-gv-declaration.ll (added)
+++ llvm/trunk/test/Linker/Inputs/wrong-addrspace-gv-declaration.ll Sun Sep 23 21:42:14 2018
@@ -0,0 +1,2 @@
+ at is_really_as1_gv = addrspace(1) global i32 0, align 4
+ at is_really_as1_gv_other_type = addrspace(1) global float 4.0, align 4
Added: llvm/trunk/test/Linker/wrong-addrspace-gv-declaration.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/wrong-addrspace-gv-declaration.ll?rev=342858&view=auto
==============================================================================
--- llvm/trunk/test/Linker/wrong-addrspace-gv-declaration.ll (added)
+++ llvm/trunk/test/Linker/wrong-addrspace-gv-declaration.ll Sun Sep 23 21:42:14 2018
@@ -0,0 +1,17 @@
+; RUN: llvm-link %s %p/Inputs/wrong-addrspace-gv-declaration.ll -S | FileCheck %s
+; RUN: llvm-link %p/Inputs/wrong-addrspace-gv-declaration.ll %s -S | FileCheck %s
+
+; The address space is declared incorrectly here, so an addrspacecast
+; is needed to link.
+
+ at is_really_as1_gv = external global i32
+ at is_really_as1_gv_other_type = external global i32
+
+; CHECK-LABEL: @foo(
+; CHECK: %load0 = load volatile i32, i32* addrspacecast (i32 addrspace(1)* @is_really_as1_gv to i32*), align 4
+; CHECK: %load1 = load volatile i32, i32* addrspacecast (i32 addrspace(1)* bitcast (float addrspace(1)* @is_really_as1_gv_other_type to i32 addrspace(1)*) to i32*), align 4
+define void @foo() {
+ %load0 = load volatile i32, i32* @is_really_as1_gv, align 4
+ %load1 = load volatile i32, i32* @is_really_as1_gv_other_type, align 4
+ ret void
+}
More information about the llvm-commits
mailing list