From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id A8EF53858D1E; Tue, 19 Jul 2022 21:57:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8EF53858D1E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Fix parsing grammer of grouped expressions as the block tail expression X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 6622ae2cd0a6b69b84a33f61ae7707c02caa88b9 X-Git-Newrev: fb1b2a6bf5eed9dd9405dca9b9c895f48509875e Message-Id: <20220719215747.A8EF53858D1E@sourceware.org> Date: Tue, 19 Jul 2022 21:57:47 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2022 21:57:47 -0000 https://gcc.gnu.org/g:fb1b2a6bf5eed9dd9405dca9b9c895f48509875e commit fb1b2a6bf5eed9dd9405dca9b9c895f48509875e Author: Philip Herron Date: Tue Jul 19 10:49:37 2022 +0100 Fix parsing grammer of grouped expressions as the block tail expression When we want to compile a grouped expression we had a check for the LEFT_PAREN during the parse_expr_without_block but this can't be handled here since in this paticular example the grouped expressions is simply the lhs of the bit shift expression. This is already handled as part of parse_expr so we can simply remove the rule here and rely on parse_expr handling this. Fixes #1393 Diff: --- gcc/rust/parse/rust-parse-impl.h | 6 ------ gcc/testsuite/rust/compile/issue-1393.rs | 13 +++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 227564cb65a..d925aca05e9 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -7276,12 +7276,6 @@ Parser::parse_expr_without_block ( case LEFT_SQUARE: // array expr (creation, not index) return parse_array_expr (std::move (outer_attrs)); - case LEFT_PAREN: - /* either grouped expr or tuple expr - depends on whether there is a - * comma - * inside the parentheses - if so, tuple expr, otherwise, grouped expr. - */ - return parse_grouped_or_tuple_expr (std::move (outer_attrs)); default: { /* HACK: piggyback on pratt parsed expr and abuse polymorphism to * essentially downcast */ diff --git a/gcc/testsuite/rust/compile/issue-1393.rs b/gcc/testsuite/rust/compile/issue-1393.rs new file mode 100644 index 00000000000..e09f01b62e5 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-1393.rs @@ -0,0 +1,13 @@ +fn tst() { + let a = 123; + let b = 0; + let _c = if b == 0 { + (a & 0x7fffff) << 1 + } else { + (a & 0x7fffff) | 0x800000 + }; +} + +fn main() { + tst() +}