commit 4fe5b640ee935f983db9445dc9fdb4009d4fa639
author Matt Arsenault <Matthew.Arsenault@amd.com> Sat Nov 16 20:24:41 2013 +0000
committer Matt Arsenault <Matthew.Arsenault@amd.com> Sat Nov 16 20:24:41 2013 +0000
tree f56b897eeafcba15c04a1ae64365283171c4dbc0
parent 2905440bdd9627f202398137aab5ded38f681fc9

Fix codegen for null different sized pointer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194932 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 009c590..b960544 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -1064,8 +1064,10 @@
     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);