diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/compile/compile-cplus-types.c | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2e59caf..66c2e33 100644 --- 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 e86a573..7fc4136 100644 --- 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 (¤t)); + } /* 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; |