From patchwork Wed Feb 12 14:09:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 106375 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 9EFC53858404 for ; Wed, 12 Feb 2025 14:10:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9EFC53858404 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=jM18e424; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=CuoMy7zc; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ynOxVcH1; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=pURpwnns X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 7EC5B3858C52 for ; Wed, 12 Feb 2025 14:09:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7EC5B3858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7EC5B3858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739369391; cv=none; b=SaHfRIwJSNP1t75Wqq9gqtuJttKdURoZhNT45JTeA89It1Kxyp8roG2eCTm3SaMYFI+HPK79BOBpt/igF05rHfARv573ALVEgC2sUz4lC3bhDPFiyjX57/SzYgASY8qlYnvHrXcnOf93hr3NKbwdYst6YNuNVlN3lDj5K/27MDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739369391; c=relaxed/simple; bh=S9dpaXibVRpt3f2vvrisDBT4kGnt0IhgF1F0G3m/Nok=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=V9DX+y7LKIEXW7zqXFqQhVbw4RqKLWsh36rtVbX7XgHEJLsv7pxIf+7Y3p/xmluvheos/QFtuHRH6EsnIKqZ9kZs0kvCcFv7FCumhKMmRzoPJxrAcwCZ5eGTeJjYO9PbgTasnBm0y5ohnEj6YhlD2/33mj7Zcp05WzjsfdgnjB8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EC5B3858C52 Received: from murzim.nue2.suse.org (unknown [10.168.4.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6D94D336A0 for ; Wed, 12 Feb 2025 14:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739369390; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=C3ZDshmvU8mreCKpLTpAgYBp7LocMerGajWe6rXFDzM=; b=jM18e424JAOqS5nx3m5ZlEWmykZdChW2rDTE3kv8zs3I5r4YiSAeG+69unIadYOGh/xiRh PKebpZ6WR1ATgAIf8sFHZ8v0yrRoV0pbt/eoNDaALZ1dNypWeIB5SwBNgOLNM0Vf4yGmHc 7uAu32c2jqUi177c2qn7lcLdtZ1cb84= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739369390; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=C3ZDshmvU8mreCKpLTpAgYBp7LocMerGajWe6rXFDzM=; b=CuoMy7zcUHfGp1hCDr4p6D9aA9ldIEychZbWPZRXGj6/xByXn5kUiVRzbvqIzpvF6XvGfL /rPwXUhtp+jpMWCw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739369389; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=C3ZDshmvU8mreCKpLTpAgYBp7LocMerGajWe6rXFDzM=; b=ynOxVcH1ZOe7DIdYdLCoRa+xeZHVV0ZROmF8tZmITBvs4YYJKHglcjBIzzciZSvpIkwFk2 SiYWK3kjs2J3jHYPNHplROOaOorAD26m6L06NMwOFojQLk6AXgPh1ySRyG7SChT37ZRlqY DKO8eC/6lfaFita0o0KlJjIxVHS8f20= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739369389; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=C3ZDshmvU8mreCKpLTpAgYBp7LocMerGajWe6rXFDzM=; b=pURpwnnstNei/8UYl6/BpidXHNQI2AS/0Q4e9+yG7QM6wI6ahCl08Q62WmHBWqfqnNbpFY tm4x74C23Fw1mbAw== Date: Wed, 12 Feb 2025 15:09:49 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/118817 - fix ICE with VN CTOR simplification MIME-Version: 1.0 X-Spam-Score: -0.99 X-Spamd-Result: default: False [-0.99 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-0.33)[-0.332]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_SHORT(-0.05)[-0.270]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[] X-Spam-Level: X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, 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 Message-Id: <20250212141040.9EFC53858404@sourceware.org> The representation of CONSTRUCTOR nodes in VN NARY and gimple_match_op do not agree so do not attempt to marshal between them. Bootstrap and regtest running on x86_64-unknown-linux-gnu. PR tree-optimization/118817 * tree-ssa-sccvn.cc (vn_nary_simplify): Do not process CONSTRUCTOR NARY or update from CONSTRUCTOR simplified gimple_match_op. * gcc.dg/pr118817.c: New testcase. --- gcc/testsuite/gcc.dg/pr118817.c | 14 ++++++++++++++ gcc/tree-ssa-sccvn.cc | 9 +++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr118817.c diff --git a/gcc/testsuite/gcc.dg/pr118817.c b/gcc/testsuite/gcc.dg/pr118817.c new file mode 100644 index 00000000000..6cfb424dbf4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr118817.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +typedef int v4si __attribute__((vector_size (sizeof(int) * 4))); + +v4si x; + +void foo (int flag) +{ + v4si tem = (v4si) { 0, 0, 0, 0 }; + if (flag) + tem = (v4si) { flag }; + x = __builtin_shufflevector (tem, tem, 0, 0, 0, 0); +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 06f6b0ccd72..8bb45780a98 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -2604,13 +2604,18 @@ vn_nary_build_or_lookup (gimple_match_op *res_op) tree vn_nary_simplify (vn_nary_op_t nary) { - if (nary->length > gimple_match_op::MAX_NUM_OPS) + if (nary->length > gimple_match_op::MAX_NUM_OPS + /* For CONSTRUCTOR the vn_nary_op_t and gimple_match_op representation + does not match. */ + || nary->opcode == CONSTRUCTOR) return NULL_TREE; gimple_match_op op (gimple_match_cond::UNCOND, nary->opcode, nary->type, nary->length); memcpy (op.ops, nary->op, sizeof (tree) * nary->length); tree res = vn_nary_build_or_lookup_1 (&op, false, true); - if (op.code.is_tree_code () && op.num_ops <= nary->length) + if (op.code.is_tree_code () + && op.num_ops <= nary->length + && (tree_code) op.code != CONSTRUCTOR) { nary->opcode = (tree_code) op.code; nary->length = op.num_ops;