diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 43e22e2ab1..2e59caf5c6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-30  Keith Seitz  <keiths@redhat.com>
+
+	* compile/compile-cplus-types.c (compile_cplus_instance::enter_scope):
+	Use "%s" and host_address_to_string instead of "%p" in printf.
+
 2018-08-29  Keith Seitz  <keiths@redhat.com>
 
 	* Makefile.in (SUBDIR_GCC_COMPILE_SRCS): Add compile-cplus-symbols.c
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 9425fc6ac7..e86a573fa3 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -259,7 +259,10 @@ compile_cplus_instance::enter_scope (compile_scope &new_scope)
   if (must_push)
     {
       if (debug_compile_cplus_scopes)
-	fprintf_unfiltered (gdb_stdlog, "entering new scope %p\n", new_scope);
+	{
+	  fprintf_unfiltered (gdb_stdlog, "entering new scope %s\n",
+			      host_address_to_string (&new_scope));
+	}
 
       /* Push the global namespace. */
       plugin ().push_namespace ("");