summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorMatt Arsenault <Matthew.Arsenault@amd.com>2014-01-02 19:53:49 +0000
committerMatt Arsenault <Matthew.Arsenault@amd.com>2014-01-02 19:53:49 +0000
commitda1deabb16a64edced99b502e4f20f7681e0110c (patch)
treefae131b4dfa8972a2e0336f787bc646d558d64db /llvm/lib
parent353bdcde904cffb814c1f0053ecd89d6c9988155 (diff)
downloadbcm5719-llvm-da1deabb16a64edced99b502e4f20f7681e0110c.tar.gz
bcm5719-llvm-da1deabb16a64edced99b502e4f20f7681e0110c.zip
Fix addrspacecast with metadata globals
llvm-svn: 198345
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Transforms/IPO/GlobalOpt.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/IPO/GlobalOpt.cpp b/llvm/lib/Transforms/IPO/GlobalOpt.cpp
index 99766190dea..40ebdea45bc 100644
--- a/llvm/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/llvm/lib/Transforms/IPO/GlobalOpt.cpp
@@ -2856,12 +2856,14 @@ static void setUsedInitializer(GlobalVariable &V,
return;
}
- SmallVector<llvm::Constant *, 8> UsedArray;
- PointerType *Int8PtrTy = Type::getInt8PtrTy(V.getContext());
+ // Type of pointer to the array of pointers.
+ PointerType *Int8PtrTy = Type::getInt8PtrTy(V.getContext(), 0);
+ SmallVector<llvm::Constant *, 8> UsedArray;
for (SmallPtrSet<GlobalValue *, 8>::iterator I = Init.begin(), E = Init.end();
I != E; ++I) {
- Constant *Cast = llvm::ConstantExpr::getBitCast(*I, Int8PtrTy);
+ Constant *Cast
+ = ConstantExpr::getPointerBitCastOrAddrSpaceCast(*I, Int8PtrTy);
UsedArray.push_back(Cast);
}
// Sort to get deterministic order.
OpenPOWER on IntegriCloud