Don't forget to print address space qualifiers when printing out the type table! Thanks to Gordon Henriksen for pointing this out.

llvm-svn: 45147

2 files changed, 5 insertions, 2 deletions

diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp
index e35b14fbc1a..090276b7ffa 100644
--- a/llvm/lib/VMCore/AsmWriter.cpp
+++ b/llvm/lib/VMCore/AsmWriter.cpp
@@ -808,7 +808,10 @@ std::ostream &AssemblyWriter::printTypeAtLeastOneLevel(const Type *Ty) {
     if (STy->isPacked())
       Out << '>';
   } else if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
-    printType(PTy->getElementType()) << '*';
+    printType(PTy->getElementType());
+    if (unsigned AddressSpace = PTy->getAddressSpace())
+      Out << " addrspace(" << AddressSpace << ")";
+    Out << '*';
   } else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
     Out << '[' << ATy->getNumElements() << " x ";
     printType(ATy->getElementType()) << ']';
diff --git a/llvm/test/Bindings/Ocaml/vmcore.ml b/llvm/test/Bindings/Ocaml/vmcore.ml
index 33a1980f2f4..65d8a316e9c 100644
--- a/llvm/test/Bindings/Ocaml/vmcore.ml
+++ b/llvm/test/Bindings/Ocaml/vmcore.ml
@@ -114,7 +114,7 @@ let test_types () =
   end;
   
   begin group "qualified_pointer";
-    (* XXX: grep {QualPtrTy.*i8.*3.*\*} < %t.ll
+    (* RUN: grep {QualPtrTy.*i8.*3.*\*} < %t.ll
      *)
     let ty = qualified_pointer_type i8_type 3 in
     insist (define_type_name "QualPtrTy" ty m);