Fix compile-cplus-types.c build errors

I see these errors when building with clang:

  CXX    compile/compile-cplus-types.o
/home/emaisin/src/binutils-gdb/gdb/compile/compile-cplus-types.c:306:56: error: cannot pass non-trivial object of type 'compile_scope' to variadic function; expected type from format string was 'void *' [-Wnon-pod-varargs]
        fprintf_unfiltered (gdb_stdlog, "leaving scope %p\n", current);
                                                       ~~     ^~~~~~~
/home/emaisin/src/binutils-gdb/gdb/compile/compile-cplus-types.c:1058:13: error: comparison of two values with different enumeration types ('enum_flags<gcc_cp_qualifiers>::enum_type' (aka 'gcc_cp_qualifiers') and 'gcc_cp_ref_qualifiers') [-Werror,-Wenum-compare]
  if (quals != GCC_CP_REF_QUAL_NONE)
      ~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~

Fix the first one by using host_address_to_string.

Fix the second one by comparing to 0 instead.  I think the current
comparison simply uses the wrong enum type.  Comparing to 0 seems like
the right thing to do, because we want to check whether any flags are
specified.

gdb/ChangeLog:

	* compile/compile-cplus-types.c
	(compile_cplus_instance::leave_scope): Take the address of scope
	object.
	(compile_cplus_instance::convert_qualified_base): Compare quals
	to 0.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2e59caf5c6bf17195d7f929eeffb39aab3e73299..66c2e33f57775d12b979b69ec8f765e3ae96c29a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * compile/compile-cplus-types.c
+       (compile_cplus_instance::leave_scope): Take the address of scope
+       object.
+       (compile_cplus_instance::convert_qualified_base): Compare quals
+       to 0.
+
 2018-08-30  Keith Seitz  <keiths@redhat.com>
 
        * compile/compile-cplus-types.c (compile_cplus_instance::enter_scope):

diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index e86a573fa31f49a9c8c70d3f9c88844d321f95ec..7fc413606e27dba54281543379b15a1e76e03c9a 100644 (file)
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -306,7 +306,10 @@ compile_cplus_instance::leave_scope ()
   if (current.m_pushed)
     {
       if (debug_compile_cplus_scopes)
-       fprintf_unfiltered (gdb_stdlog, "leaving scope %p\n", current);
+       {
+         fprintf_unfiltered (gdb_stdlog, "leaving scope %s\n",
+                             host_address_to_string (&current));
+       }
 
       /* Pop namespaces.  */
       std::for_each
@@ -1058,7 +1061,7 @@ compile_cplus_instance::convert_qualified_base (gcc_type base,
 {
   gcc_type result = base;
 
-  if (quals != GCC_CP_REF_QUAL_NONE)
+  if (quals != 0)
     result = plugin ().build_qualified_type (base, quals);
 
   return result;