Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 4/8] Remove gdb workaround from readline/xfree.c
Date: Tue, 06 Aug 2019 20:43:00 -0000	[thread overview]
Message-ID: <20190806204334.13441-5-tom@tromey.com> (raw)
In-Reply-To: <20190806204334.13441-1-tom@tromey.com>

There is a gdb-local patch to deal with interrupts during completion.
The original thread adding this patch is here:

https://sourceware.org/ml/gdb-patches/2011-06/msg00147.html

I believe readline now implements the approach suggested by
Chet Ramey:

https://sourceware.org/ml/gdb-patches/2011-06/msg00493.html

So, I believe this patch can be removed.

2018-10-07  Tom Tromey  <tom@tromey.com>

	* Makefile.in (xfree.o): Don't depend on readline.h.
	* xfree.c (xfree): Remove gdb workaround.
	* xmalloc.h (xfree): Remove #define.
---
 readline/ChangeLog.gdb | 6 ++++++
 readline/Makefile.in   | 2 +-
 readline/xfree.c       | 7 -------
 readline/xmalloc.h     | 3 ---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/readline/Makefile.in b/readline/Makefile.in
index 0916d33e065..1adfc286b81 100644
--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -437,7 +437,7 @@ vi_mode.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
 vi_mode.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
 vi_mode.o: history.h ansi_stdlib.h rlstdc.h
 xfree.o: ${BUILD_DIR}/config.h
-xfree.o: ansi_stdlib.h readline.h
+xfree.o: ansi_stdlib.h
 xmalloc.o: ${BUILD_DIR}/config.h
 xmalloc.o: ansi_stdlib.h
 
diff --git a/readline/xfree.c b/readline/xfree.c
index d3af7d9aef0..37a81e6c236 100644
--- a/readline/xfree.c
+++ b/readline/xfree.c
@@ -31,10 +31,7 @@
 #  include "ansi_stdlib.h"
 #endif /* HAVE_STDLIB_H */
 
-#include <stdio.h>
-
 #include "xmalloc.h"
-#include "readline.h"
 
 /* **************************************************************** */
 /*								    */
@@ -48,10 +45,6 @@ void
 xfree (string)
      PTR_T string;
 {
-  /* Leak a bit.  */
-  if (RL_ISSTATE(RL_STATE_SIGHANDLER))
-    return;
-
   if (string)
     free (string);
 }
diff --git a/readline/xmalloc.h b/readline/xmalloc.h
index 0fb6a1960e1..f40d7a596a2 100644
--- a/readline/xmalloc.h
+++ b/readline/xmalloc.h
@@ -38,9 +38,6 @@
 
 #endif /* !PTR_T */
 
-/* xmalloc and xrealloc should be also protected from RL_STATE_SIGHANDLER.  */
-#define xfree xfree_readline
-
 extern PTR_T xmalloc PARAMS((size_t));
 extern PTR_T xrealloc PARAMS((void *, size_t));
 extern void xfree PARAMS((void *));
-- 
2.17.2


  parent reply	other threads:[~2019-08-06 20:43 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-06 20:43 [PATCH 0/8] Upgrade readline Tom Tromey
2019-08-06 20:43 ` [PATCH 7/8] Remove readline hack from gdb_select Tom Tromey
2019-08-07 14:29   ` Pedro Alves
2019-08-07 22:03     ` Tom Tromey
2019-08-07 22:16       ` Christian Biesinger via gdb-patches
2019-08-06 20:43 ` Tom Tromey [this message]
2019-08-06 20:43 ` [PATCH 8/8] Require readline 7 or newer Tom Tromey
2019-08-07  2:27   ` Eli Zaretskii
2019-08-07 14:42   ` Pedro Alves
2019-08-07 22:31     ` Tom Tromey
2019-08-08  2:37       ` Eli Zaretskii
2019-08-08 11:26       ` Pedro Alves
2019-08-08 11:29       ` Pedro Alves
2019-08-08 20:38         ` Tom Tromey
2019-08-07 14:45   ` Pedro Alves
2019-08-06 20:43 ` [PATCH 2/8] Remove gdb workaround from readline/complete.c Tom Tromey
2019-08-06 20:43 ` [PATCH 5/8] Fix gdb's selftest.exp after readline import Tom Tromey
2019-08-13 17:02   ` [committed][gdb/testsuite] Fix gdb.gdb/selftest.exp regexp Tom de Vries
2019-08-06 20:43 ` [PATCH 3/8] Remove gdb workaround from readline/emacs_keymap.c Tom Tromey
2019-08-07  3:05 ` [PATCH 0/8] Upgrade readline Kevin Buettner
2019-08-07 13:38   ` Tom Tromey
2019-08-07 13:40   ` Tom Tromey
2019-08-14 10:21     ` Tom de Vries
2019-08-15 13:46       ` Tom Tromey
2019-08-19 16:38         ` Tom de Vries
2019-08-07 16:32 ` Sergio Durigan Junior
2019-08-07 19:31   ` Tom Tromey
2019-08-12 19:46     ` Sergio Durigan Junior
2019-08-12 19:52       ` Christian Biesinger via gdb-patches

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=20190806204334.13441-5-tom@tromey.com \
    --to=tom@tromey.com \
    --cc=gdb-patches@sourceware.org \
    /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