diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index f597772..cae1f4b 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -632,7 +632,7 @@
 
     // Handle pointer conversions next: pointers can only be converted to/from
     // other pointers and integers.
-    if (isa<PointerType>(DstType)) {
+    if (isa<llvm::PointerType>(DstTy)) {
       // The source value may be an integer, or a pointer.
       if (isa<llvm::PointerType>(Src->getType()))
         return llvm::ConstantExpr::getBitCast(Src, DstTy);
@@ -640,7 +640,7 @@
       return llvm::ConstantExpr::getIntToPtr(Src, DstTy);
     }
     
-    if (isa<PointerType>(SrcType)) {
+    if (isa<llvm::PointerType>(Src->getType())) {
       // Must be an ptr to int cast.
       assert(isa<llvm::IntegerType>(DstTy) && "not ptr->int?");
       return llvm::ConstantExpr::getPtrToInt(Src, DstTy);
diff --git a/test/CodeGen/address-space-cast.c b/test/CodeGen/address-space-cast.c
new file mode 100644
index 0000000..473c8e0
--- /dev/null
+++ b/test/CodeGen/address-space-cast.c
@@ -0,0 +1,4 @@
+// RUN: clang -emit-llvm < %s
+
+volatile unsigned char* const __attribute__((address_space(1))) serial_ctrl = 0x02;
+