diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -767,7 +767,8 @@
 }
 
 static void printAddressOfOp(OpAsmPrinter &p, AddressOfOp op) {
-  p << op.getOperationName() << " @" << op.global_name();
+  p << op.getOperationName() << " ";
+  p.printSymbolName(op.global_name());
   p.printOptionalAttrDict(op.getAttrs(), {"global_name"});
   p << " : " << op.getResult().getType();
 }
diff --git a/mlir/test/Dialect/LLVMIR/global.mlir b/mlir/test/Dialect/LLVMIR/global.mlir
--- a/mlir/test/Dialect/LLVMIR/global.mlir
+++ b/mlir/test/Dialect/LLVMIR/global.mlir
@@ -6,8 +6,8 @@
 // CHECK: llvm.mlir.global internal constant @constant(3.700000e+01 : f64) : !llvm.float
 llvm.mlir.global internal constant @constant(37.0) : !llvm.float
 
-// CHECK: llvm.mlir.global internal constant @string("foobar")
-llvm.mlir.global internal constant @string("foobar") : !llvm<"[6 x i8]">
+// CHECK: llvm.mlir.global internal constant @".string"("foobar")
+llvm.mlir.global internal constant @".string"("foobar") : !llvm<"[6 x i8]">
 
 // CHECK: llvm.mlir.global internal @string_notype("1234567")
 llvm.mlir.global internal @string_notype("1234567")
@@ -51,8 +51,8 @@
   // CHECK: llvm.mlir.addressof @global : !llvm<"i64*">
   %0 = llvm.mlir.addressof @global : !llvm<"i64*">
 
-  // CHECK: llvm.mlir.addressof @string : !llvm<"[6 x i8]*">
-  %1 = llvm.mlir.addressof @string : !llvm<"[6 x i8]*">
+  // CHECK: llvm.mlir.addressof @".string" : !llvm<"[6 x i8]*">
+  %1 = llvm.mlir.addressof @".string" : !llvm<"[6 x i8]*">
 
   llvm.return
 }