aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-01-18 22:11:56 -0500
committerJason Merrill <jason@redhat.com>2022-01-18 23:06:56 -0500
commitbd0ef3534816a1b8ffad544d9ed720690a97d7cc (patch)
treec2698fd2af8ce7a264b60c49adc89bd8d5b8a81c
parentddce00dba244d889d688490517fb106169a72f01 (diff)
downloadgcc-bd0ef3534816a1b8ffad544d9ed720690a97d7cc.zip
gcc-bd0ef3534816a1b8ffad544d9ed720690a97d7cc.tar.gz
gcc-bd0ef3534816a1b8ffad544d9ed720690a97d7cc.tar.bz2
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.
-rw-r--r--gcc/cp/parser.cc3
1 files changed, 2 insertions, 1 deletions
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 ()