diff options
| author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2013-11-16 20:24:41 +0000 |
|---|---|---|
| committer | Matt Arsenault <Matthew.Arsenault@amd.com> | 2013-11-16 20:24:41 +0000 |
| commit | 19231e630e4ccf8b8ced1c9a7fe65f596a160a5c (patch) | |
| tree | 38ed1bcd68b55fb5b1cc6cf992eb03ebe6ed9479 /llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | |
| parent | 378a9f2b915fbecb290cf816d6113e1a4eaa6f71 (diff) | |
| download | bcm5719-llvm-19231e630e4ccf8b8ced1c9a7fe65f596a160a5c.tar.gz bcm5719-llvm-19231e630e4ccf8b8ced1c9a7fe65f596a160a5c.zip | |
Fix codegen for null different sized pointer.
llvm-svn: 194932
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 009c590cad4..b9605448c1c 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -1064,8 +1064,10 @@ SDValue SelectionDAGBuilder::getValueImpl(const Value *V) { if (const GlobalValue *GV = dyn_cast<GlobalValue>(C)) return DAG.getGlobalAddress(GV, getCurSDLoc(), VT); - if (isa<ConstantPointerNull>(C)) - return DAG.getConstant(0, TLI->getPointerTy()); + if (isa<ConstantPointerNull>(C)) { + unsigned AS = V->getType()->getPointerAddressSpace(); + return DAG.getConstant(0, TLI->getPointerTy(AS)); + } if (const ConstantFP *CFP = dyn_cast<ConstantFP>(C)) return DAG.getConstantFP(*CFP, VT); |
