From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 101433858D33 for ; Thu, 27 Apr 2023 08:37:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 101433858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 0FF9821A4E for ; Thu, 27 Apr 2023 08:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682584644; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=Qt+VeORGF7omkF0oCUYLga1Z8Rx8nlvkQJdTeT75g4Q=; b=rmAw8wIV9347NZyZkQOMZwbsyjkdOiLCWXWUznfOaosSyxxaRzhs3VXV/K0jsm4z+z0fqF Cmnm6yCi0Dxw83oJvJEAbiokkV6LhO1FXD6caYh5XGrzoV+ZMzvm3eFONQBWhCVj8su3Qp DkfB+vj1NdM7sZKX4HJM2Ack2v5En2o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682584644; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=Qt+VeORGF7omkF0oCUYLga1Z8Rx8nlvkQJdTeT75g4Q=; b=NNeCcCVrOvruoJY4Jzlgdq3G8RLga9MoFrUCl0zGLDVUMipowOZolwEkMWmjk8FJs4UeAU l9odFS/SNJ4oEpBw== Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 0620F2C141 for ; Thu, 27 Apr 2023 08:37:24 +0000 (UTC) Date: Thu, 27 Apr 2023 08:37:23 +0000 (UTC) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/109594 - wrong register promotion User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Message-ID: <20230427083723.heVOPUoqtjNaXw4TD1QXoTesbHJO32yrylEHjiTkm5U@z> We fail to verify the constraints under which we allow handled components to wrap registers. The gcc.dg/pr70022.c testcase shows that we happily end up with _2 = VIEW_CONVERT_EXPR(v_1(D)) as produced by SSA rewrite and update_address_taken. But the intent was that we wrap registers with at most a single level of handled components and specifically only allow __real, __imag, BIT_FIELD_REF and VIEW_CONVERT_EXPR on them, but not ARRAY_REF or COMPONENT_REF. Together with the improved gimple_load predicate taking advantage of the above and ASAN this eventually ICEd. The following fixes update_address_taken as to this constraint. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/109594 * tree-ssa.cc (non_rewritable_mem_ref_base): Constrain what we rewrite to a register based on the above. --- gcc/tree-ssa.cc | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/gcc/tree-ssa.cc b/gcc/tree-ssa.cc index 4ca1f5f3104..70828355c2b 100644 --- a/gcc/tree-ssa.cc +++ b/gcc/tree-ssa.cc @@ -1572,14 +1572,30 @@ non_rewritable_mem_ref_base (tree ref) if (DECL_P (ref)) return NULL_TREE; - if (! (base = CONST_CAST_TREE (strip_invariant_refs (ref)))) + switch (TREE_CODE (ref)) { - base = get_base_address (ref); - if (DECL_P (base)) - return base; - return NULL_TREE; + case REALPART_EXPR: + case IMAGPART_EXPR: + case BIT_FIELD_REF: + if (DECL_P (TREE_OPERAND (ref, 0))) + return NULL_TREE; + break; + case VIEW_CONVERT_EXPR: + if (DECL_P (TREE_OPERAND (ref, 0))) + { + if (TYPE_SIZE (TREE_TYPE (ref)) + != TYPE_SIZE (TREE_TYPE (TREE_OPERAND (ref, 0)))) + return TREE_OPERAND (ref, 0); + return NULL_TREE; + } + break; + /* We would need to rewrite ARRAY_REFs or COMPONENT_REFs and even + more so multiple levels of handled components. */ + default:; } + base = ref; + /* But watch out for MEM_REFs we cannot lower to a VIEW_CONVERT_EXPR or a BIT_FIELD_REF. */ if (TREE_CODE (base) == MEM_REF @@ -1630,9 +1646,14 @@ non_rewritable_mem_ref_base (tree ref) return decl; } + /* We cannot rewrite a decl in the base. */ + base = get_base_address (ref); + if (DECL_P (base)) + return base; + /* We cannot rewrite TARGET_MEM_REFs. */ - if (TREE_CODE (base) == TARGET_MEM_REF - && TREE_CODE (TREE_OPERAND (base, 0)) == ADDR_EXPR) + else if (TREE_CODE (base) == TARGET_MEM_REF + && TREE_CODE (TREE_OPERAND (base, 0)) == ADDR_EXPR) { tree decl = TREE_OPERAND (TREE_OPERAND (base, 0), 0); if (! DECL_P (decl)) -- 2.35.3