[PATCH] Fix build failure with macOS bison

[PATCH] Fix build failure with macOS bison

[Tom Tromey]

PR gdb/24060 points out a compilation failure of the C parser when it
is built using the macOS system bison.  The bug is a name clash
between the VARIABLE token name and the VARIABLE enumerator in
ui-out.h.

This patch renames VARIABLE in c-exp.y to avoid the clash.  I chose to
rename this identifier because it was the more localized change.

gdb/ChangeLog
2019-01-06  Tom Tromey  <tom@tromey.com>

	PR gdb/24060:
	* c-exp.y (CONV_VAR): Rename from VARIABLE.
---
 gdb/ChangeLog | 5 +++++
 gdb/c-exp.y   | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 155fe09f37..3d7f6a05b5 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -234,7 +234,7 @@ static void c_print_token (FILE *file, int type, YYSTYPE value);
    legal basetypes.  */
 %token SIGNED_KEYWORD LONG SHORT INT_KEYWORD CONST_KEYWORD VOLATILE_KEYWORD DOUBLE_KEYWORD
 
-%token <sval> VARIABLE
+%token <sval> CONV_VAR
 
 %token <opcode> ASSIGN_MODIFY
 
@@ -798,7 +798,7 @@ exp	:	FLOAT
 exp	:	variable
 	;
 
-exp	:	VARIABLE
+exp	:	CONV_VAR
 			{
 			  write_dollar_variable (pstate, $1);
 			}
@@ -2884,7 +2884,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
       }
 
   if (*tokstart == '$')
-    return VARIABLE;
+    return CONV_VAR;
 
   if (parse_completion && *lexptr == '\0')
     saw_name_at_eof = 1;
@@ -3337,7 +3337,7 @@ c_print_token (FILE *file, int type, YYSTYPE value)
       break;
 
     case NSSTRING:
-    case VARIABLE:
+    case CONV_VAR:
       parser_fprintf (file, "sval<%s>", copy_name (value.sval));
       break;
 
-- 
2.17.2

Re: [PATCH] Fix build failure with macOS bison

[Tom Tromey]

>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:

Tom> PR gdb/24060 points out a compilation failure of the C parser when it
Tom> is built using the macOS system bison.  The bug is a name clash
Tom> between the VARIABLE token name and the VARIABLE enumerator in
Tom> ui-out.h.

Tom> This patch renames VARIABLE in c-exp.y to avoid the clash.  I chose to
Tom> rename this identifier because it was the more localized change.

Tom> gdb/ChangeLog
Tom> 2019-01-06  Tom Tromey  <tom@tromey.com>

Tom> 	PR gdb/24060:
Tom> 	* c-exp.y (CONV_VAR): Rename from VARIABLE.

Simon -- I can't readily try this patch on macOS right now, so I was
hoping you could.

Tom

Re: [PATCH] Fix build failure with macOS bison

[Simon Marchi]

On 2019-01-06 11:50, Tom Tromey wrote:
> Simon -- I can't readily try this patch on macOS right now, so I was
> hoping you could.

I could tomorrow when I am at work.

Simon

Re: [PATCH] Fix build failure with macOS bison

[Simon Marchi]

On 2019-01-07 21:00, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi <simon.marchi@ericsson.com> writes:
> 
> Simon> Since other files already use the name DOLLAR_VARIABLE, I
> suggest using it
> Simon> too.  I went a bit further and changed other .y files too, so 
> they use a
> Simon> consistent name.
> 
> Simon> Tom, are you ok with this?
> 
> Yes, completely.  Thanks for doing this.

Pushed, thanks.

Simon

Re: [PATCH] Fix build failure with macOS bison

[Tom Tromey]

>>>>> "Simon" == Simon Marchi <simon.marchi@ericsson.com> writes:

Simon> Since other files already use the name DOLLAR_VARIABLE, I suggest using it
Simon> too.  I went a bit further and changed other .y files too, so they use a
Simon> consistent name.

Simon> Tom, are you ok with this?

Yes, completely.  Thanks for doing this.

Tom

Re: [PATCH] Fix build failure with macOS bison

[Simon Marchi]

On 2019-01-07 11:14 a.m., John Marshall wrote:
> On 7 Jan 2019, at 15:38, John Marshall <John.W.Marshall@glasgow.ac.uk> wrote:
>> Tom Tromey wrote:
>>> Simon -- I can't readily try this patch on macOS right now, so I was
>>> hoping you could.
>>
>> I have independently done the same bisection as in gdb/24060 (should have looked at the list archives more carefully first!), and can confirm that this patch fixes c-exp.y. However the same problem occurs for f-exp.y (and perhaps others).
> 
> Problem exists in c-exp.y, f-exp.y, and p-exp.y. The others have avoided this (probably mostly by luck) by naming their similar thing DOLLAR_VARIABLE (d-exp.y and go-exp.y) or other similar names.
> 
>     John
> 

Indeed.

Since other files already use the name DOLLAR_VARIABLE, I suggest using it
too.  I went a bit further and changed other .y files too, so they use a
consistent name.

Tom, are you ok with this?


From a2ac953450b79b460064ebc717d54c5d896b69c2 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sun, 6 Jan 2019 09:49:11 -0700
Subject: [PATCH] Fix build failure with macOS bison

PR gdb/24060 points out a compilation failure of the C, Fortran and Pascal
parsers when they are built using the macOS system bison.  The bug is a name
clash between the VARIABLE token name and the VARIABLE enumerator in ui-out.h.

This patch renames VARIABLE in c-exp.y, f-exp.y and p-exp.y to DOLLAR_VARIABLE
to avoid the clash.  It also renames similar variables in other .y files so
that all languages use the same name.

gdb/ChangeLog
2019-01-07  Tom Tromey  <tom@tromey.com>
2019-01-07  Simon Marchi  <simon.marchi@ericsson.com>

	PR gdb/24060:
	* ada-exp.y (DOLLAR_VARIABLE): Rename from SPECIAL_VARIABLE.
	* ada-lex.l (DOLLAR_VARIABLE): Likewise.
	* c-exp.y (DOLLAR_VARIABLE): Rename from VARIABLE.
	* f-exp.y (DOLLAR_VARIABLE): Likewise.
	* m2-exp.y (DOLLAR_VARIABLE): Rename from INTERNAL_VAR.
	* p-exp.y (DOLLAR_VARIABLE): Rename from VARIABLE.
---
 gdb/ada-exp.y | 4 ++--
 gdb/ada-lex.l | 2 +-
 gdb/c-exp.y   | 8 ++++----
 gdb/f-exp.y   | 6 +++---
 gdb/m2-exp.y  | 6 +++---
 gdb/p-exp.y   | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 5342e6b2b70..5925416e88f 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -151,7 +151,7 @@ static struct type *type_system_address (struct parser_state *);

 /* Special type cases, put in to allow the parser to distinguish different
    legal basetypes.  */
-%token <sval> SPECIAL_VARIABLE
+%token <sval> DOLLAR_VARIABLE

 %nonassoc ASSIGN
 %left _AND_ OR XOR THEN ELSE
@@ -275,7 +275,7 @@ primary :	var_or_type	%prec VAR
 			}
 	;

-primary :	SPECIAL_VARIABLE /* Various GDB extensions */
+primary :	DOLLAR_VARIABLE /* Various GDB extensions */
 			{ write_dollar_variable (pstate, $1); }
 	;

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 95ea92e12d4..05af013c258 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -290,7 +290,7 @@ false		{ return FALSEKEYWORD; }
 "$"({LETTER}|{DIG}|"$")*  {
 		  yylval.sval.ptr = yytext;
 		  yylval.sval.length = yyleng;
-		  return SPECIAL_VARIABLE;
+		  return DOLLAR_VARIABLE;
 		}

 	/* CATCH-ALL ERROR CASE */
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 155fe09f37a..f3ef23c75a7 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -234,7 +234,7 @@ static void c_print_token (FILE *file, int type, YYSTYPE value);
    legal basetypes.  */
 %token SIGNED_KEYWORD LONG SHORT INT_KEYWORD CONST_KEYWORD VOLATILE_KEYWORD DOUBLE_KEYWORD

-%token <sval> VARIABLE
+%token <sval> DOLLAR_VARIABLE

 %token <opcode> ASSIGN_MODIFY

@@ -798,7 +798,7 @@ exp	:	FLOAT
 exp	:	variable
 	;

-exp	:	VARIABLE
+exp	:	DOLLAR_VARIABLE
 			{
 			  write_dollar_variable (pstate, $1);
 			}
@@ -2884,7 +2884,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
       }

   if (*tokstart == '$')
-    return VARIABLE;
+    return DOLLAR_VARIABLE;

   if (parse_completion && *lexptr == '\0')
     saw_name_at_eof = 1;
@@ -3337,7 +3337,7 @@ c_print_token (FILE *file, int type, YYSTYPE value)
       break;

     case NSSTRING:
-    case VARIABLE:
+    case DOLLAR_VARIABLE:
       parser_fprintf (file, "sval<%s>", copy_name (value.sval));
       break;

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index ae6f86a34be..d70c66474c0 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -161,7 +161,7 @@ static int parse_number (struct parser_state *, const char *, int,
 %token BOOL_AND BOOL_OR BOOL_NOT
 %token <lval> CHARACTER

-%token <voidval> VARIABLE
+%token <voidval> DOLLAR_VARIABLE

 %token <opcode> ASSIGN_MODIFY

@@ -426,7 +426,7 @@ exp	:	FLOAT
 exp	:	variable
 	;

-exp	:	VARIABLE
+exp	:	DOLLAR_VARIABLE
 	;

 exp	:	SIZEOF '(' type ')'	%prec UNARY
@@ -1135,7 +1135,7 @@ yylex (void)
   if (*tokstart == '$')
     {
       write_dollar_variable (pstate, yylval.sval);
-      return VARIABLE;
+      return DOLLAR_VARIABLE;
     }

   /* Use token-type TYPENAME for symbols that happen to be defined
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index a0394916172..85d587651a2 100644
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -125,7 +125,7 @@ static int number_sign = 1;
 /* The GDB scope operator */
 %token COLONCOLON

-%token <voidval> INTERNAL_VAR
+%token <voidval> DOLLAR_VARIABLE

 /* M2 tokens */
 %left ','
@@ -535,7 +535,7 @@ variable:	fblock
 	;

 /* GDB internal ($foo) variable */
-variable:	INTERNAL_VAR
+variable:	DOLLAR_VARIABLE
 	;

 /* GDB scope operator */
@@ -949,7 +949,7 @@ yylex (void)
   if (*tokstart == '$')
     {
       write_dollar_variable (pstate, yylval.sval);
-      return INTERNAL_VAR;
+      return DOLLAR_VARIABLE;
     }

   /* Use token-type BLOCKNAME for symbols that happen to be defined as
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index 7e2769e33ca..31e8c4bea66 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -158,7 +158,7 @@ static int search_field;
 /* Special type cases, put in to allow the parser to distinguish different
    legal basetypes.  */

-%token <voidval> VARIABLE
+%token <voidval> DOLLAR_VARIABLE


 /* Object pascal */
@@ -521,7 +521,7 @@ exp	:	FLOAT
 exp	:	variable
 	;

-exp	:	VARIABLE
+exp	:	DOLLAR_VARIABLE
 			/* Already written by write_dollar_variable.
 			   Handle current_type.  */
  			{  if (intvar) {
@@ -1492,7 +1492,7 @@ yylex (void)
       tmp[namelen] = '\0';
       intvar = lookup_only_internalvar (tmp + 1);
       free (uptokstart);
-      return VARIABLE;
+      return DOLLAR_VARIABLE;
     }

   /* Use token-type BLOCKNAME for symbols that happen to be defined as
-- 
2.20.1

Re: [PATCH] Fix build failure with macOS bison

[John Marshall]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 4402 bytes --]

On 7 Jan 2019, at 15:38, John Marshall <John.W.Marshall@glasgow.ac.uk> wrote:
> Tom Tromey wrote:
>> Simon -- I can't readily try this patch on macOS right now, so I was
>> hoping you could.
> 
> I have independently done the same bisection as in gdb/24060 (should have looked at the list archives more carefully first!), and can confirm that this patch fixes c-exp.y. However the same problem occurs for f-exp.y (and perhaps others).

Problem exists in c-exp.y, f-exp.y, and p-exp.y. The others have avoided this (probably mostly by luck) by naming their similar thing DOLLAR_VARIABLE (d-exp.y and go-exp.y) or other similar names.

    John
From gdb-patches-return-153242-listarch-gdb-patches=sources.redhat.com@sourceware.org Mon Jan 07 16:16:54 2019
Return-Path: <gdb-patches-return-153242-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Delivered-To: listarch-gdb-patches@sources.redhat.com
Received: (qmail 5517 invoked by alias); 7 Jan 2019 16:16:54 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Delivered-To: mailing list gdb-patches@sourceware.org
Received: (qmail 5508 invoked by uid 89); 7 Jan 2019 16:16:53 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-1.9 required=5.0 testsºYES_00,KAM_SHORT,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1202, dear, officer, kindly
X-HELO: smtp.polymtl.ca
Received: from smtp.polymtl.ca (HELO smtp.polymtl.ca) (132.207.4.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 07 Jan 2019 16:16:52 +0000
Received: from simark.ca (simark.ca [158.69.221.121])	(authenticated bits=0)	by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id x07GGjtu026647	(version=TLSv1/SSLv3 cipherìDHE-RSA-AES256-GCM-SHA384 bits%6 verify=NOT)	for <gdb-patches@sourceware.org>; Mon, 7 Jan 2019 11:16:50 -0500
Received: by simark.ca (Postfix, from userid 112)	id 62CC91E7B9; Mon,  7 Jan 2019 11:16:45 -0500 (EST)
Received: from simark.ca (localhost [127.0.0.1])	by simark.ca (Postfix) with ESMTP id 9DC821E4A3;	Mon,  7 Jan 2019 11:16:43 -0500 (EST)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding: 7bit
Date: Mon, 07 Jan 2019 16:16:00 -0000
From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-buildbot@sergiodj.net
Cc: Nick Clifton <nickc@redhat.com>, gdb-patches@sourceware.org
Subject: Re: Oh dear. I regret to inform you that commit 053af8c9034f92d6e36a1180655ba22a65c56437 might be unfortunate
In-Reply-To: <053af8c9034f92d6e36a1180655ba22a65c56437-master-breakage@gdb-build>
References: <053af8c9034f92d6e36a1180655ba22a65c56437-master-breakage@gdb-build>
Message-ID: <c9d33a75a00d4ceb8e126a1dbcbcb16c@polymtl.ca>
X-Sender: simon.marchi@polymtl.ca
User-Agent: Roundcube Webmail/1.3.6
X-IsSubscribed: yes
X-SW-Source: 2019-01/txt/msg00132.txt.bz2
Content-length: 1110

On 2019-01-07 08:26, gdb-buildbot@sergiodj.net wrote:
> My lords, ladies, gentlemen, members of the public.
>
> It is a matter of great regret and sadness to inform you that commit:
>
> 	Sync libiberty sources with master version in gcc repository.
> Updated stabs demangling and cxxfilt tests to match.
> 	053af8c9034f92d6e36a1180655ba22a65c56437
>
> might have made GDB unwell.  Since I am just your Butler BuildBot,
> I kindly ask that a human superior officer double-check this.
>
> Please note that if you are reading this message on gdb-patches, there
> might
> be other builders broken.
>
> You can find more details about the unfortunate breakage in the next
> messages.
>
> Cheers,
>
> Your GDB BuildBot.

Hi Nick,

As you can see, GDB needs to be adjusted to stop using
cplus_demangle_opname (it was expected [1]).  It shouldn't be too
difficult to do, but I would prefer not to rush it (take the time to
test it, get it reviewed).  Would you mind reverting this patch, just
the time we adjust the GDB code?

Thanks,

Simon

[1] https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01160.html

Re: [PATCH] Fix build failure with macOS bison

[John Marshall]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 4915 bytes --]

Tom Tromey wrote:
> Simon -- I can't readily try this patch on macOS right now, so I was
> hoping you could.

I have independently done the same bisection as in gdb/24060 (should have looked at the list archives more carefully first!), and can confirm that this patch fixes c-exp.y. However the same problem occurs for f-exp.y (and perhaps others).

    John
From gdb-patches-return-153239-listarch-gdb-patches=sources.redhat.com@sourceware.org Mon Jan 07 15:40:37 2019
Return-Path: <gdb-patches-return-153239-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Delivered-To: listarch-gdb-patches@sources.redhat.com
Received: (qmail 13692 invoked by alias); 7 Jan 2019 15:40:37 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Delivered-To: mailing list gdb-patches@sourceware.org
Received: (qmail 13677 invoked by uid 89); 7 Jan 2019 15:40:36 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-1.9 required=5.0 testsºYES_00,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1388, closely
X-HELO: gateway30.websitewelcome.com
Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.168.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 07 Jan 2019 15:40:34 +0000
Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4])	by gateway30.websitewelcome.com (Postfix) with ESMTP id ACEAAA133	for <gdb-patches@sourceware.org>; Mon,  7 Jan 2019 09:40:33 -0600 (CST)
Received: from box5379.bluehost.com ([162.241.216.53])	by cmsmtp with SMTP	id gX0zgXtYd2PzOgX0zgCrog; Mon, 07 Jan 2019 09:40:33 -0600
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com;	 sÞfault; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:	References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:	Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:	Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:	List-Subscribe:List-Post:List-Owner:List-Archive;	bh=DGv+TAazXGj19YQ8KHykq7Dw8BHJF/sSjflJ5IbrfcI=; b=yEzKcbafOZ0o1pCcMkVX4HrRDH	y48nq9/uWpGi04wKIHhw4EAUaKkWNaon/ui7ODjjOdczcil6YBTAU8XmvTMwfgdKCzgb2hFj//x62	Flab+bM21mVKfyJBPssfHL1nH;
Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:50688 heloºpiya)	by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256)	(Exim 4.91)	(envelope-from <tom@tromey.com>)	id 1ggX0z-001F1n-DM; Mon, 07 Jan 2019 09:40:33 -0600
From: Tom Tromey <tom@tromey.com>
To: Andrew Burgess <andrew.burgess@embecosm.com>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH] gdb: Replace make_bpstat_clear_actions_cleanup
References: <20190107124354.17415-1-andrew.burgess@embecosm.com>
Date: Mon, 07 Jan 2019 15:40:00 -0000
In-Reply-To: <20190107124354.17415-1-andrew.burgess@embecosm.com> (Andrew	Burgess's message of "Mon, 7 Jan 2019 12:43:54 +0000")
Message-ID: <87zhsczdan.fsf@tromey.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.90 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-SW-Source: 2019-01/txt/msg00129.txt.bz2
Content-length: 1345

>>>>> "Andrew" == Andrew Burgess <andrew.burgess@embecosm.com> writes:

Andrew> Replace make_bpstat_clear_actions_cleanup with a new class that can
Andrew> perform the cleanup.

Andrew> gdb/ChangeLog:

Andrew> 	* breakpoint.c (bpstat_clear_actions): Rename to...
Andrew> 	(scoped_bpstat_clear_actions::do_bpstat_clear_actions): ...this.
Andrew> 	(bpstat_do_actions): Switch from using
Andrew> 	make_bpstat_clear_actions_cleanup to use
Andrew> 	scoped_bpstat_clear_actions.
Andrew> 	* breakpoint.h (class scoped_bpstat_clear_actions): New.
Andrew> 	* infrun.c (fetch_inferior_event): Switch from using
Andrew> 	make_bpstat_clear_actions_cleanup to use
Andrew> 	scoped_bpstat_clear_actions.
Andrew> 	* top.c (execute_command): Likewise.
Andrew> 	* utils.c (do_bpstat_clear_actions_cleanup): Delete.
Andrew> 	(make_bpstat_clear_actions_cleanup): Delete.
Andrew> 	* utils.h (make_bpstat_clear_actions_cleanup): Delete.

BTW, this is ok.  There's no need to wait on some other series that
hasn't been sent.

Andrew>  void
Andrew> -bpstat_clear_actions (void)
Andrew> +scoped_bpstat_clear_actions::do_bpstat_clear_actions (void)

I looked more closely, and this approach is actually a bit more
"integrated" (not sure what word to use) than mine, as mine left
bpstat_clear_actions as an ordinary function.  So perhaps this is a
better way to go.

Tom