From: Jason Merrill <jason@redhat.com>
Date: Wed, 19 Jan 2022 03:11:56 +0000 (-0500)
Subject: c++: fix PR104025 change
X-Git-Tag: upstream/12.2.0~1981
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd0ef3534816a1b8ffad544d9ed720690a97d7cc;p=platform%2Fupstream%2Fgcc.git

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 --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 60d9f7b..00279c4 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 ()