diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2025-03-18 18:51:48 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2025-03-18 18:51:48 +0100 |
| commit | 53d8ed13bb5a6972efab7c56c066010cd1f78b35 (patch) | |
| tree | 32e08178dcef7495b506b74432fe7f3033f6e7d8 /gcc/testsuite/c-c++-common | |
| parent | 1d7f57da583782ae5d56655a3ac413bdf259838a (diff) | |
| download | gcc-53d8ed13bb5a6972efab7c56c066010cd1f78b35.zip gcc-53d8ed13bb5a6972efab7c56c066010cd1f78b35.tar.gz gcc-53d8ed13bb5a6972efab7c56c066010cd1f78b35.tar.bz2 | |
c: Fix handling of [[gnu::musttail] return in if and else bodies [PR119311]
The following new testcase FAILs with C (and succeeds with C++).
c_parser_handle_musttail is used in c_parser_compound_statement_nostart
where it is directly passed to c_parser_statement_after_labels, and in
c_parser_all_labels where it is returned. Now, out of the 3
c_parser_all_labels callers, c_parser_statement passes it down to
c_parser_statement_after_labels, but c_parser_if_body and c_parser_else_body
don't, so if there are return statements with [[gnu::musttail]] or
[[clang::musttail]] directly in if or else bodies rather than wrapped with
{}s, we throw that information away.
2025-03-18 Jakub Jelinek <jakub@redhat.com>
PR c/119311
* c-parser.cc (c_parser_if_body): Pass result of c_parser_all_labels
as last argument to c_parser_statement_after_labels.
(c_parser_else_body): Likewise.
* c-c++-common/musttail14.c: Use * instead of \* in the regexps.
* c-c++-common/musttail25.c: New test.
Diffstat (limited to 'gcc/testsuite/c-c++-common')
| -rw-r--r-- | gcc/testsuite/c-c++-common/musttail14.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/musttail25.c | 28 |
2 files changed, 31 insertions, 3 deletions
diff --git a/gcc/testsuite/c-c++-common/musttail14.c b/gcc/testsuite/c-c++-common/musttail14.c index e95bc9b..56a52b8 100644 --- a/gcc/testsuite/c-c++-common/musttail14.c +++ b/gcc/testsuite/c-c++-common/musttail14.c @@ -1,9 +1,9 @@ /* PR tree-optimization/118430 */ /* { dg-do compile { target musttail } } */ /* { dg-options "-O2 -fdump-tree-optimized" } */ -/* { dg-final { scan-tree-dump-times " \[^\n\r]* = bar \\\(\[^\n\r]\*\\\); \\\[tail call\\\] \\\[must tail call\\\]" 1 "optimized" } } */ -/* { dg-final { scan-tree-dump-times " \[^\n\r]* = freddy \\\(\[^\n\r]\*\\\); \\\[tail call\\\] \\\[must tail call\\\]" 1 "optimized" } } */ -/* { dg-final { scan-tree-dump-not " (?:bar|freddy) \\\(\[^\n\r]\*\\\); \\\[tail call\\\]" "optimized" } } */ +/* { dg-final { scan-tree-dump-times " \[^\n\r]* = bar \\\(\[^\n\r]*\\\); \\\[tail call\\\] \\\[must tail call\\\]" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " \[^\n\r]* = freddy \\\(\[^\n\r]*\\\); \\\[tail call\\\] \\\[must tail call\\\]" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-not " (?:bar|freddy) \\\(\[^\n\r]*\\\); \\\[tail call\\\]" "optimized" } } */ __attribute__ ((noipa)) void foo (int x) diff --git a/gcc/testsuite/c-c++-common/musttail25.c b/gcc/testsuite/c-c++-common/musttail25.c new file mode 100644 index 0000000..ab28698 --- /dev/null +++ b/gcc/testsuite/c-c++-common/musttail25.c @@ -0,0 +1,28 @@ +/* PR c/119311 */ +/* { dg-do compile { target musttail } } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump-times " \[^\n\r]* = bar \\\(\[^\n\r]*\\\); \\\[tail call\\\] \\\[must tail call\\\]" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times " \[^\n\r]* = baz \\\(\[^\n\r]*\\\); \\\[tail call\\\] \\\[must tail call\\\]" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-not " (?:bar|baz) \\\(\[^\n\r]*\\\); \\\[tail call\\\]" "optimized" } } */ + + +[[gnu::noipa]] int +bar (int x, int y) +{ + return x + y; +} + +[[gnu::noipa]] int +baz (int x, int y) +{ + return x * y; +} + +int +foo (int a, int b) +{ + if (a > b) + [[gnu::musttail]] return bar (a - b, b); + else + [[gnu::musttail]] return baz (a, b - a); +} |