public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-6716] c++: fix PR104025 change
Date: Wed, 19 Jan 2022 04:07:15 +0000 (GMT)	[thread overview]
Message-ID: <20220119040715.473DF3858037@sourceware.org> (raw)

https://gcc.gnu.org/g:bd0ef3534816a1b8ffad544d9ed720690a97d7cc

commit r12-6716-gbd0ef3534816a1b8ffad544d9ed720690a97d7cc
Author: Jason Merrill <jason@redhat.com>
Date:   Tue Jan 18 22:11:56 2022 -0500

    c++: fix PR104025 change
    
    Somehow I pushed my earlier patch without it actually fixing the test; we
    need input_location to be for the last consumed token, not the next one.
    
    gcc/cp/ChangeLog:
    
            * parser.cc (saved_token_sentinel::rollback): Use
            cp_lexer_previous_token.

Diff:
---
 gcc/cp/parser.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 60d9f7bb723..00279c43404 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -1308,7 +1308,8 @@ struct saved_token_sentinel
   void rollback ()
   {
     cp_lexer_rollback_tokens (lexer);
-    cp_lexer_set_source_position (lexer);
+    cp_lexer_set_source_position_from_token
+      (cp_lexer_previous_token (lexer));
     mode = STS_DONOTHING;
   }
   ~saved_token_sentinel ()


                 reply	other threads:[~2022-01-19  4:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220119040715.473DF3858037@sourceware.org \
    --to=jason@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).