From: Joel Brobecker <brobecker@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [pushed/Ada] fix "stale cleanup" internal-warning when using "catch assert" command
Date: Tue, 22 May 2018 14:50:00 -0000 [thread overview]
Message-ID: <1526999977-126638-2-git-send-email-brobecker@adacore.com> (raw)
In-Reply-To: <1526999977-126638-1-git-send-email-brobecker@adacore.com>
Trying to insert a catchpoint on all Ada assertions now triggers
the following internal warning regardless of the situation. For
instance, not even debugging any program:
(gdb) catch assert
/[...]/gdb/common/cleanups.c:264: internal-warning:
restore_my_cleanups has found a stale cleanup
This is due to a small bug in the following C++-ification commit:
commit bc18fbb575437dd10089ef4619e46c0b9a93097d
Date: Fri May 18 15:58:50 2018 -0600
Subject: Change ada_catchpoint::excep_string to be a std::string
The stale cleanup in question is the following one in top.c:execute_command:
cleanup_if_error = make_bpstat_clear_actions_cleanup ();
This cleanup is expected to be discarded if there are no exception.
There were no GDB exception; however, a C++ exception was triggered,
because we passed NULL as the excep_string argument when calling
create_ada_exception_catchpoint, which is a reference to a const
string. So we get a C++ exception during the std::string constructor,
which propagates up, causing the cleanup to unexpectedly remain
in the cleanup chain.
This patch fixes the immediate issue of the incorrect call to
create_ada_exception_catchpoint.
gdb/ChangeLog:
* ada-lang.c (catch_assert_command): Pass empty string instead
of NULL for excep_string argument.
Tested on x86_64-linux, fixes the following failures:
* catch_assert_if.exp: insert catchpoint on failed assertions with condition
* catch_ex.exp: insert catchpoint on failed assertions
This also fixes about a dozen UNRESOLVED tests that are a consequence
of the two tests above failing and crashing GDB.
Pushed to master.
---
gdb/ChangeLog | 5 +++++
gdb/ada-lang.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8d425a7..653771a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-22 Joel Brobecker <brobecker@adacore.com>
+
+ * ada-lang.c (catch_assert_command): Pass empty string instead
+ of NULL for excep_string argument.
+
2018-05-22 Maciej W. Rozycki <macro@mips.com>
* mips-linux-nat.c (mips64_linux_register_addr): Return -1 if
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index eaf3058..64bddc2 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13408,7 +13408,7 @@ catch_assert_command (const char *arg_entry, int from_tty,
arg = "";
catch_ada_assert_command_split (arg, cond_string);
create_ada_exception_catchpoint (gdbarch, ada_catch_assert,
- NULL, cond_string,
+ "", cond_string,
tempflag, 1 /* enabled */,
from_tty);
}
--
2.1.4
next prev parent reply other threads:[~2018-05-22 14:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-19 20:37 [RFA 0/3] More Ada cleanup removal Tom Tromey
2018-05-19 16:06 ` [RFA 3/3] Change ada_catchpoint::excep_string to be a std::string Tom Tromey
2018-05-21 1:12 ` Simon Marchi
2018-05-22 14:49 ` [pushed+RFC] C++ exception during command triggers stale cleanup internal-warning Joel Brobecker
2018-05-22 14:50 ` Joel Brobecker [this message]
2018-05-22 14:58 ` Tom Tromey
2018-05-22 15:48 ` Joel Brobecker
2018-05-19 16:06 ` [RFA 2/3] Remove cleanup from ada_collect_symbol_completion_matches Tom Tromey
2018-05-21 0:09 ` Simon Marchi
2018-05-19 20:37 ` [RFA 1/3] Remove cleanup from ada-lang.c Tom Tromey
2018-05-21 0:06 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526999977-126638-2-git-send-email-brobecker@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).