From patchwork Tue Apr 15 23:07:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 110530 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C436E3857833 for ; Tue, 15 Apr 2025 23:15:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C436E3857833 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=quicinc.com header.i=@quicinc.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=P5OQlHF9 X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by sourceware.org (Postfix) with ESMTPS id 105693857C7B for ; Tue, 15 Apr 2025 23:07:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 105693857C7B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 105693857C7B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744758444; cv=none; b=ABbW7ooR1f57RjIoMdGnsnepNgBqVugkF3twCnclig2hapZ61Iw69TJA5D7zmIOo4y7lJlbUpO5HVMF80uoCFTNVT1xa1+Vi+prVaWMcQi3iwBjgz4YXXUF/+5pJOvgo6lSOBehxIQA5FrshVGlERknlt8nQMZA+FG5nEvbgmbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744758444; c=relaxed/simple; bh=c/xjcBZj/LpNnsoVEmn/nPAWDHfyPHayctBjAveusMk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FWBhTRhURN2dGyirDb6HORUk1buBMwA0wNY3SOpl0P9Uy/+w62dKpmE6ME09P0X8mbAr7iTlHArzuojSj6SWENaza8pZhIJ13q9kpLqhmhsMhJ3ryItSsi01yM+p/XqbDvwpKPypJjqG5ApBUJbOR7qlbiHKbthgozvLR6zigQE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 105693857C7B Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53FID5kU031962 for ; Tue, 15 Apr 2025 23:07:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= rs/MHipJJsX/gcumKn6+twBzd4uIiS/6GO8JXReYOKc=; b=P5OQlHF9JZyokKPU jnZM7LuSFe58utYcfYUK9l7MGp66NdDyUahO6kYoK1kXZCYM0cqZoiVDGidlv76g 6omCSCgWX2vqL+5dHJiEB46taLtPiNK04rdUflygIbGwL6gXCzRoITW8T9vXBu3T Zh+p3aOe22kgodi18rzCnkv6S1Sn+BVg4DV0za9m+QKaOTdcjwA1aRYDMw0YQkR3 bCubZWm6UdxcT3qKaFpaYdOQh4GBjh3u89F19UFwRj9GFuU079WWP71iNaipudik GysN1yxxAYnHBwI6Z0htahHN9+W0ekKQxKyBdu7HM9uwta8+r2uZRSJMZ0qu350k 8RhUyw== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45yfs19kjn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 15 Apr 2025 23:07:23 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 53FN7Mjf008119 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 15 Apr 2025 23:07:22 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 15 Apr 2025 16:07:22 -0700 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PUSHED/13 2/3] match: Reject non-ssa name/min invariants in gimple_extract [PR116412] Date: Tue, 15 Apr 2025 16:07:09 -0700 Message-ID: <20250415230710.1619233-3-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250415230710.1619233-1-quic_apinski@quicinc.com> References: <20250415230710.1619233-1-quic_apinski@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=P9I6hjAu c=1 sm=1 tr=0 ts=67fee6ab cx=c_pps a=JYp8KDb2vCoCEuGobkYCKw==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=3H110R4YSZwA:10 a=XR8D0OoHHMoA:10 a=COk6AnOGAAAA:8 a=W2bJxiJut82lZbZZ5NUA:9 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: xLIA4PZOROLjzMo6q45zvSd3VJumkzL5 X-Proofpoint-ORIG-GUID: xLIA4PZOROLjzMo6q45zvSd3VJumkzL5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-15_08,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 impostorscore=0 phishscore=0 suspectscore=0 mlxscore=0 spamscore=0 malwarescore=0 adultscore=0 priorityscore=1501 mlxlogscore=886 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504150164 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org After the conversion for phiopt's conditional operand to use maybe_push_res_to_seq, it was found that gimple_extract will extract out from REALPART_EXPR/IMAGPART_EXPR/VCE and BIT_FIELD_REF, a memory load. But that extraction was not needed as memory loads are not simplified in match and simplify. So gimple_extract should return false in those cases. Changes since v1: * Move the rejection to gimple_extract from factor_out_conditional_operation. GCC13: the function is in gimple-match-head.cc rather than gimple-match-exports.cc. Bootstrapped and tested on x86_64-linux-gnu. PR tree-optimization/116412 gcc/ChangeLog: * gimple-match-head.cc (gimple_extract): Return false if op0 was not a SSA name nor a min invariant for REALPART_EXPR/IMAGPART_EXPR/VCE and BIT_FIELD_REF. gcc/testsuite/ChangeLog: * gcc.dg/torture/pr116412-1.c: New test. Signed-off-by: Andrew Pinski (cherry picked from commit c7b76a076cb2c6ded7ae208464019b04cb0531a2) --- gcc/gimple-match-head.cc | 6 ++++++ gcc/testsuite/gcc.dg/torture/pr116412-1.c | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr116412-1.c diff --git a/gcc/gimple-match-head.cc b/gcc/gimple-match-head.cc index 21843d7870b..b3e7792a8fa 100644 --- a/gcc/gimple-match-head.cc +++ b/gcc/gimple-match-head.cc @@ -945,6 +945,9 @@ gimple_extract (gimple *stmt, gimple_match_op *res_op, || code == VIEW_CONVERT_EXPR) { tree op0 = TREE_OPERAND (gimple_assign_rhs1 (stmt), 0); + /* op0 needs to be a SSA name or an min invariant. */ + if (TREE_CODE (op0) != SSA_NAME && !is_gimple_min_invariant (op0)) + return false; res_op->set_op (code, type, valueize_op (op0)); return true; } @@ -952,6 +955,9 @@ gimple_extract (gimple *stmt, gimple_match_op *res_op, { tree rhs1 = gimple_assign_rhs1 (stmt); tree op0 = valueize_op (TREE_OPERAND (rhs1, 0)); + /* op0 needs to be a SSA name or an min invariant. */ + if (TREE_CODE (op0) != SSA_NAME && !is_gimple_min_invariant (op0)) + return false; res_op->set_op (code, type, op0, TREE_OPERAND (rhs1, 1), TREE_OPERAND (rhs1, 2), diff --git a/gcc/testsuite/gcc.dg/torture/pr116412-1.c b/gcc/testsuite/gcc.dg/torture/pr116412-1.c new file mode 100644 index 00000000000..3bc26ecd8b8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr116412-1.c @@ -0,0 +1,6 @@ +/* { dg-do compile } */ +double f(_Complex double a, _Complex double *b, int c) +{ + if (c) return __real__ a; + return __real__ *b; +}