OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Simon Marchi 2018-08-30 11:09:48 -04:00
parent 385e5b9039
commit a0dc02a6df
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -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):

7
gdb/compile/compile-cplus-types.c
View File

@ -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;