diff --git a/compiler-rt/lib/msan/msan.cpp b/compiler-rt/lib/msan/msan.cpp
--- a/compiler-rt/lib/msan/msan.cpp
+++ b/compiler-rt/lib/msan/msan.cpp
@@ -515,6 +515,7 @@
   }
 
   unsigned char *s = (unsigned char*)MEM_TO_SHADOW(x);
+  Printf("%p[%p]  ", s, x);
   for (uptr i = 0; i < size; i++)
     Printf("%x%x ", s[i] >> 4, s[i] & 0xf);
   Printf("\n");
diff --git a/compiler-rt/test/msan/msan_dump_shadow.cpp b/compiler-rt/test/msan/msan_dump_shadow.cpp
--- a/compiler-rt/test/msan/msan_dump_shadow.cpp
+++ b/compiler-rt/test/msan/msan_dump_shadow.cpp
@@ -18,5 +18,5 @@
   return 0;
 }
 
-// CHECK: ff ff ff ff ff
-// CHECK: 00 00 00
+// CHECK: 0x{{[0-9a-f]+}}[0x{{[0-9a-f]+}}]  ff ff ff ff ff
+// CHECK: 0x{{[0-9a-f]+}}[0x{{[0-9a-f]+}}]  00 00 00