From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 809513858D20; Mon, 12 Jun 2023 09:30:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 809513858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686562233; bh=kfNNsxMz5eUTyxtl48J5qPaAX7wlXxN6Vgk+Jdxvi+U=; h=From:To:Subject:Date:From; b=kCLx9JHoEeKLzYenjsCk/W76Z5rlcMDF0RueYvgGzKi3JLAJ/01JN6jDPuq0xCy7Q 9DDwfDEdbgeiNZz5twnUqKqh4yfFepb+5v3t/nxfaS6Kh304wYWoS8+Rpy1snVPIMb g2tDoXT0dFb9rUstqBl9ds4ksfIcDVZUo2xMzrlw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9694] middle-end/110200 - genmatch force-leaf and convert interaction X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 94c8326f42707301a37070c280447e148d5322c2 X-Git-Newrev: d5f72834a4817b180625a540b99f5c1934c2e0b8 Message-Id: <20230612093033.809513858D20@sourceware.org> Date: Mon, 12 Jun 2023 09:30:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d5f72834a4817b180625a540b99f5c1934c2e0b8 commit r12-9694-gd5f72834a4817b180625a540b99f5c1934c2e0b8 Author: Richard Biener Date: Mon Jun 12 10:17:26 2023 +0200 middle-end/110200 - genmatch force-leaf and convert interaction The following fixes code GENERIC generation for (convert! ...) which currently generates if (TREE_TYPE (_o1[0]) != type) _r1 = fold_build1_loc (loc, NOP_EXPR, type, _o1[0]); if (EXPR_P (_r1)) goto next_after_fail867; else _r1 = _o1[0]; where obviously braces are missing. PR middle-end/110200 * genmatch.cc (expr::gen_transform): Put braces around the if arm for the (convert ...) short-cut. (cherry picked from commit 820d1aec89c43dbbc70d3d0b888201878388454c) Diff: --- gcc/genmatch.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/genmatch.cc b/gcc/genmatch.cc index 5b25fc8da86..80c64d88928 100644 --- a/gcc/genmatch.cc +++ b/gcc/genmatch.cc @@ -2548,7 +2548,8 @@ expr::gen_transform (FILE *f, int indent, const char *dest, bool gimple, { fprintf_indent (f, indent, "if (TREE_TYPE (_o%d[0]) != %s)\n", depth, type); - indent += 2; + fprintf_indent (f, indent + 2, "{\n"); + indent += 4; } if (opr->kind == id_base::CODE) fprintf_indent (f, indent, "_r%d = fold_build%d_loc (loc, %s, %s", @@ -2571,7 +2572,8 @@ expr::gen_transform (FILE *f, int indent, const char *dest, bool gimple, } if (*opr == CONVERT_EXPR) { - indent -= 2; + fprintf_indent (f, indent - 2, "}\n"); + indent -= 4; fprintf_indent (f, indent, "else\n"); fprintf_indent (f, indent, " _r%d = _o%d[0];\n", depth, depth); }