From patchwork Thu Dec 12 17:51:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [review,v2] Silence ARI for valid calls to abort X-Patchwork-Submitter: "Simon Marchi \(Code Review\)" X-Patchwork-Id: 28484 Message-Id: <20191212175118.6FAEE25BB4@gnutoolchain-gerrit.osci.io> To: Pedro Alves , gdb-patches@sourceware.org Date: Thu, 12 Dec 2019 12:51:17 -0500 From: "Tom Tromey (Code Review)" List-Id: Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/744 ...................................................................... Silence ARI for valid calls to abort There are a handful of spots in gdb that validly call abort. This patch adds the appropriate ARI marker to these lines, to silence the ARI report. This also removes the "fix" call for "abort" from gdb_ari.sh; it was incorrect and now is not needed. gdb/ChangeLog 2019-12-12 Tom Tromey * contrib/ari/gdb_ari.sh: Remove "fix" call for abort. * utils.c (abort_with_message, dump_core, internal_vproblem): Add ARI marker to abort. * event-top.c (handle_sigsegv): Add ARI marker to abort. Change-Id: I09ce6aa5010bbe4e5bb73ffdb727481be39d34d6 --- M gdb/ChangeLog M gdb/contrib/ari/gdb_ari.sh M gdb/event-top.c M gdb/utils.c 4 files changed, 11 insertions(+), 5 deletions(-) -- Gerrit-Project: binutils-gdb Gerrit-Branch: master Gerrit-Change-Id: I09ce6aa5010bbe4e5bb73ffdb727481be39d34d6 Gerrit-Change-Number: 744 Gerrit-PatchSet: 2 Gerrit-Owner: Tom Tromey Gerrit-Reviewer: Pedro Alves Gerrit-Reviewer: Tom Tromey Gerrit-MessageType: newpatchset diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9560ecb..34e5c64 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-12-12 Tom Tromey + + * contrib/ari/gdb_ari.sh: Remove "fix" call for abort. + * utils.c (abort_with_message, dump_core, internal_vproblem): Add + ARI marker to abort. + * event-top.c (handle_sigsegv): Add ARI marker to abort. + 2019-12-05 Tom Tromey * contrib/ari/gdb_ari.sh: Fix floatformat_from_double text. diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh index d05f4af..300ed76 100755 --- a/gdb/contrib/ari/gdb_ari.sh +++ b/gdb/contrib/ari/gdb_ari.sh @@ -647,7 +647,6 @@ BEGIN { doc["abort"] = "\ Do not use abort, instead use internal_error; GDB should never abort" category["abort"] = ari_regression - fix("abort", "gdb/utils.c", 3) } /(^|[^_[:alnum:]])abort[[:space:]]*\(/ { fail("abort") diff --git a/gdb/event-top.c b/gdb/event-top.c index 9ec599e..5feb292 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -881,7 +881,7 @@ install_handle_sigsegv (); if (thread_local_segv_handler == nullptr) - abort (); + abort (); /* ARI: abort */ thread_local_segv_handler (sig); } diff --git a/gdb/utils.c b/gdb/utils.c index f7fae35..08be146 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -186,7 +186,7 @@ else fputs_unfiltered (msg, gdb_stderr); - abort (); /* NOTE: GDB has only three calls to abort(). */ + abort (); /* ARI: abort */ } /* Dump core trying to increase the core soft limit to hard limit first. */ @@ -200,7 +200,7 @@ setrlimit (RLIMIT_CORE, &rlim); #endif /* HAVE_SETRLIMIT */ - abort (); /* NOTE: GDB has only three calls to abort(). */ + abort (); /* ARI: abort */ } /* Check whether GDB will be able to dump core using the dump_core @@ -320,7 +320,7 @@ does not fix this problem. This is the solution suggested at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509. */ if (write (STDERR_FILENO, msg, sizeof (msg)) != sizeof (msg)) - abort (); /* NOTE: GDB has only three calls to abort(). */ + abort (); /* ARI: abort */ exit (1); } }