From patchwork Thu Dec 12 17:51:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36782 Received: (qmail 1216 invoked by alias); 12 Dec 2019 17:51:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 1156 invoked by uid 89); 12 Dec 2019 17:51:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Dec 2019 17:51:23 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id E678B20A87; Thu, 12 Dec 2019 12:51:21 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id 830D820391; Thu, 12 Dec 2019 12:51:18 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 6FAEE25BB4; Thu, 12 Dec 2019 12:51:18 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Thu, 12 Dec 2019 12:51:17 -0500 From: "Tom Tromey (Code Review)" To: Pedro Alves , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v2] Silence ARI for valid calls to abort X-Gerrit-Change-Id: I09ce6aa5010bbe4e5bb73ffdb727481be39d34d6 X-Gerrit-Change-Number: 744 X-Gerrit-ChangeURL: X-Gerrit-Commit: eb776acbc6ffee623775a005ce88caf417b1f150 In-Reply-To: References: Reply-To: tromey@sourceware.org, palves@redhat.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191212175118.6FAEE25BB4@gnutoolchain-gerrit.osci.io> 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(-) 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); } }