From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 1E1E8384B0C9; Thu, 6 Oct 2022 08:41:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E1E8384B0C9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665045663; bh=FAjtpOY/d1whY9IwbLIwP4nk70Klb02N2F0uqzVn/So=; h=From:To:Subject:Date:From; b=SVFL/L/QCRImvNsAlIXBEx1rUjojYE4Xu83yZxL67tyjdBWA57aAkaNb9IaQuFrNj Cw7uGONGzWKceN+G4iAE4h1f7Jn8kUKledwFH5pvhRph0EK6ztwTcwfvY5XjAE03t2 FXGLPvJGLl+cSeLFfyAWMjQRF9o3ieyP1HBiHLp4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3107] openmp: Map holds clause to IFN_ASSUME for C/C++ X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 08b51baddc53d64aa4c5e7a81ef3c4bf320293be X-Git-Newrev: 847f5addc4d07a2f3b95f5daa50ab4a64dfd957d Message-Id: <20221006084103.1E1E8384B0C9@sourceware.org> Date: Thu, 6 Oct 2022 08:41:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:847f5addc4d07a2f3b95f5daa50ab4a64dfd957d commit r13-3107-g847f5addc4d07a2f3b95f5daa50ab4a64dfd957d Author: Jakub Jelinek Date: Thu Oct 6 10:39:41 2022 +0200 openmp: Map holds clause to IFN_ASSUME for C/C++ Now that [[assume (cond)]] support is in, this simple patch makes #pragma omp assume holds(cond) use it. 2022-10-06 Jakub Jelinek * c-parser.cc (c_parser_omp_assumption_clauses): Emit IFN_ASSUME call for holds clause on assume construct. * parser.cc (cp_parser_omp_assumption_clauses): Emit IFN_ASSUME call for holds clause on assume construct. * c-c++-common/gomp/assume-4.c: New test. Diff: --- gcc/c/c-parser.cc | 8 +++++--- gcc/cp/parser.cc | 8 +++++--- gcc/testsuite/c-c++-common/gomp/assume-4.c | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 9b7663739dd..67b919c0b18 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -23571,10 +23571,12 @@ c_parser_omp_assumption_clauses (c_parser *parser, bool is_assume) tree t = convert_lvalue_to_rvalue (eloc, expr, true, true).value; t = c_objc_common_truthvalue_conversion (eloc, t); t = c_fully_fold (t, false, NULL); - if (is_assume) + if (is_assume && t != error_mark_node) { - /* FIXME: Emit .ASSUME (t) call here. */ - (void) t; + tree fn = build_call_expr_internal_loc (eloc, IFN_ASSUME, + void_type_node, 1, + t); + add_stmt (fn); } parens.skip_until_found_close (parser); } diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index baa808a4634..90e06f914fb 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -46023,13 +46023,15 @@ cp_parser_omp_assumption_clauses (cp_parser *parser, cp_token *pragma_tok, matching_parens parens; if (parens.require_open (parser)) { + location_t eloc = cp_lexer_peek_token (parser->lexer)->location; tree t = cp_parser_assignment_expression (parser); if (!type_dependent_expression_p (t)) t = contextual_conv_bool (t, tf_warning_or_error); - if (is_assume) + if (is_assume && !error_operand_p (t)) { - /* FIXME: Emit .ASSUME (t) call here. */ - (void) t; + t = build_call_expr_internal_loc (eloc, IFN_ASSUME, + void_type_node, 1, t); + finish_expr_stmt (t); } if (!parens.require_close (parser)) cp_parser_skip_to_closing_parenthesis (parser, diff --git a/gcc/testsuite/c-c++-common/gomp/assume-4.c b/gcc/testsuite/c-c++-common/gomp/assume-4.c new file mode 100644 index 00000000000..9da2296fd1d --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/assume-4.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-fopenmp -O2 -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump-times "return 42;" 2 "optimized" } } */ +/* { dg-final { scan-tree-dump-not "return -1;" "optimized" } } */ + +int +foo (int x) +{ + int y; + #pragma omp assume holds (x == 42) + y = x; + return y; +} + +int +bar (int x) +{ + #pragma omp assume holds (x < 42) + ; + if (x == 42) + return -1; + return 42; +}