public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Maciej W. Rozycki <macro@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-5789] testsuite: Fix subexpressions with `scan-assembler-times' Date: Thu, 23 Nov 2023 16:16:51 +0000 (GMT) [thread overview] Message-ID: <20231123161651.690E3385828F@sourceware.org> (raw) https://gcc.gnu.org/g:ba0869323e1d45b1328b4cb723cb139a2e2146c3 commit r14-5789-gba0869323e1d45b1328b4cb723cb139a2e2146c3 Author: Maciej W. Rozycki <macro@embecosm.com> Date: Thu Nov 23 16:13:59 2023 +0000 testsuite: Fix subexpressions with `scan-assembler-times' We have an issue with `scan-assembler-times' handling expressions using subexpressions as produced by capturing parentheses `()' in an odd way, and one that is inconsistent with `scan-assembler', `scan-assembler-not', etc. The problem comes from calling `regexp' with `-inline -all', which causes a list to be returned that would otherwise be placed in match variables. Consequently if we have say: /* { dg-final { scan-assembler-times "\\s(foo|bar)\\s" 1 } } */ in a test case and there is a lone `foo' present in output being matched, then our invocation of `regexp -inline -all' in `scan-assembler-times' will return: { foo } foo and that in turn will confuse our match count calculation as `llength' will return 2 rather than 1, making the test fail even though `foo' was only actually matched once. It seems unclear why we chose to call `regexp' in such an odd way in the first place just to figure out the number of matches. The first version of TCL that supports the `-all' option to `regexp' is 8.3, and according to its documentation[1][2] `regexp' already returns the number of matches found whenever `-all' has been used *unless* `-inline' has also been used. Remove the `-inline' option then along with the `llength' invocation. References: [1] "Tcl Built-In Commands - regexp manual page", <https://www.tcl.tk/man/tcl8.2.3/TclCmd/regexp.html> [2] "Tcl Built-In Commands - regexp manual page", <https://www.tcl.tk/man/tcl8.3/TclCmd/regexp.html> gcc/testsuite/ * lib/scanasm.exp (scan-assembler-times): Remove the `-inline' option to `regexp' and the wrapping `llength' call. Diff: --- gcc/testsuite/lib/scanasm.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 85ee54ff9a8..4fbf65744e9 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -505,7 +505,7 @@ proc scan-assembler-times { args } { close $fd regsub -all {(^|\n)[[:space:]]*\.section[[:space:]]*\.gnu\.lto_(?:[^\n]*\n(?![[:space:]]*\.(section|text|data|bss)))*[^\n]*\n} $text {\1} text - set result_count [llength [regexp -inline -all -- $pattern $text]] + set result_count [regexp -all -- $pattern $text] if {$result_count == $times} { pass "$testcase scan-assembler-times $pp_pattern $times" } else {
reply other threads:[~2023-11-23 16:16 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=20231123161651.690E3385828F@sourceware.org \ --to=macro@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).