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-6703] c++: input_location and lookahead [PR104025] Date: Tue, 18 Jan 2022 22:57:10 +0000 (GMT) [thread overview] Message-ID: <20220118225710.BDEDC3857C48@sourceware.org> (raw) https://gcc.gnu.org/g:2aa184458a11a7ec8c1b451b8eeff458a24632bb commit r12-6703-g2aa184458a11a7ec8c1b451b8eeff458a24632bb Author: Jason Merrill <jason@redhat.com> Date: Mon Jan 17 17:16:38 2022 -0500 c++: input_location and lookahead [PR104025] Debug information was getting confused because input_location was different depending on whether we had looked ahead to see if the next tokens look like a template argument list. I tried resetting input_location in cp_lexer_rollback_tokens itself, but that caused regressions, so let's just do it here for now. PR c++/104025 gcc/cp/ChangeLog: * parser.cc (saved_token_sentinel::rollback): Call cp_lexer_set_source_position. (~saved_token_sentinel): Call rollback. gcc/testsuite/ChangeLog: * g++.dg/warn/pr104025.C: New test. Co-authored-by: Jakub Jelinek <jakub@redhat.com> Diff: --- gcc/cp/parser.cc | 3 ++- gcc/testsuite/g++.dg/warn/pr104025.C | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index b262b765a9a..60d9f7bb723 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -1308,6 +1308,7 @@ struct saved_token_sentinel void rollback () { cp_lexer_rollback_tokens (lexer); + cp_lexer_set_source_position (lexer); mode = STS_DONOTHING; } ~saved_token_sentinel () @@ -1315,7 +1316,7 @@ struct saved_token_sentinel if (mode == STS_COMMIT) cp_lexer_commit_tokens (lexer); else if (mode == STS_ROLLBACK) - cp_lexer_rollback_tokens (lexer); + rollback (); gcc_assert (lexer->saved_tokens.length () == len); } diff --git a/gcc/testsuite/g++.dg/warn/pr104025.C b/gcc/testsuite/g++.dg/warn/pr104025.C new file mode 100644 index 00000000000..9457c8ef52c --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pr104025.C @@ -0,0 +1,20 @@ +// PR c++/104025 +// { dg-do compile } +// { dg-options "-Wmissing-template-keyword -fcompare-debug" } + +void bar (int); + +struct S { int i; }; + +template <class C> +struct T +{ + int m; + C c; + void foo () + { + bar (c.i < m); + } +}; + +template void T<S>::foo ();
reply other threads:[~2022-01-18 22:57 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=20220118225710.BDEDC3857C48@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: linkBe 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).