From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 3DB233858C31 for ; Fri, 28 Apr 2023 09:48:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3DB233858C31 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-out2.suse.de (Postfix) with ESMTP id 6695D20039 for ; Fri, 28 Apr 2023 09:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682675315; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=qzxqZ3jSczYf6O71Ed0fvp90wDIzHIAUWvP5fMPMg+I=; b=EJqvJ8pi5ipqkAzTcBShusyXbE9cUXjvqLM2dO7kp6+7BbsfTutiz3Dgzw2I5ZtMe6cx1d EChCWCIEsvJ5zJSc3PyphwULg4tSxmzpUjsEfv3fOkH6kEohJgM0ne+TJOn32opGhsgSQ4 a8Q9DTjulZy1BSoj2xfdS3F8Kstyo2w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682675315; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=qzxqZ3jSczYf6O71Ed0fvp90wDIzHIAUWvP5fMPMg+I=; b=c7zvrk30RgCJeAihflmg6ORp+BBSk5O75zc8Gv8wHRIjKJJgkl1U4yUBRCsixNkHD277Kl Iu8p5Y3KfwJsS3Cw== 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 51FBC2C153 for ; Fri, 28 Apr 2023 09:48:35 +0000 (UTC) Date: Fri, 28 Apr 2023 09:48:35 +0000 (UTC) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/109644 - missing IL checking 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: <20230428094835.VrEhfv2qDiriOPwIjjEX5yTUsOAOJu2pmMw8KEuXH0Y@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. The following makes IL verification stricter which catches the problem. Bootstrapped and tested with all languages enabled on x86_64-unknown-linux-gnu with {,-m32}. Pushed. PR tree-optimization/109644 * tree-cfg.cc (verify_types_in_gimple_reference): Check register constraints on the outermost VIEW_CONVERT_EXPR only. Do not allow register or invariant bases on multi-level or possibly variable index handled components. --- gcc/tree-cfg.cc | 75 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index 5ef201adb25..4927fc0a8d9 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -3107,10 +3107,12 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) if (TREE_CODE (expr) == REALPART_EXPR || TREE_CODE (expr) == IMAGPART_EXPR - || TREE_CODE (expr) == BIT_FIELD_REF) + || TREE_CODE (expr) == BIT_FIELD_REF + || TREE_CODE (expr) == VIEW_CONVERT_EXPR) { tree op = TREE_OPERAND (expr, 0); - if (!is_gimple_reg_type (TREE_TYPE (expr))) + if (TREE_CODE (expr) != VIEW_CONVERT_EXPR + && !is_gimple_reg_type (TREE_TYPE (expr))) { error ("non-scalar %qs", code_name); return true; @@ -3172,11 +3174,39 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) debug_generic_stmt (TREE_TYPE (TREE_TYPE (op))); return true; } + + if (TREE_CODE (expr) == VIEW_CONVERT_EXPR) + { + /* For VIEW_CONVERT_EXPRs which are allowed here too, we only check + that their operand is not a register an invariant when + requiring an lvalue (this usually means there is a SRA or IPA-SRA + bug). Otherwise there is nothing to verify, gross mismatches at + most invoke undefined behavior. */ + if (require_lvalue + && (is_gimple_reg (op) || is_gimple_min_invariant (op))) + { + error ("conversion of %qs on the left hand side of %qs", + get_tree_code_name (TREE_CODE (op)), code_name); + debug_generic_stmt (expr); + return true; + } + else if (is_gimple_reg (op) + && TYPE_SIZE (TREE_TYPE (expr)) != TYPE_SIZE (TREE_TYPE (op))) + { + error ("conversion of register to a different size in %qs", + code_name); + debug_generic_stmt (expr); + return true; + } + } + expr = op; } + bool require_non_reg = false; while (handled_component_p (expr)) { + require_non_reg = true; code_name = get_tree_code_name (TREE_CODE (expr)); if (TREE_CODE (expr) == REALPART_EXPR @@ -3242,34 +3272,6 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) } } - if (TREE_CODE (expr) == VIEW_CONVERT_EXPR) - { - /* For VIEW_CONVERT_EXPRs which are allowed here too, we only check - that their operand is not an SSA name or an invariant when - requiring an lvalue (this usually means there is a SRA or IPA-SRA - bug). Otherwise there is nothing to verify, gross mismatches at - most invoke undefined behavior. */ - if (require_lvalue - && (TREE_CODE (op) == SSA_NAME - || is_gimple_min_invariant (op))) - { - error ("conversion of %qs on the left hand side of %qs", - get_tree_code_name (TREE_CODE (op)), code_name); - debug_generic_stmt (expr); - return true; - } - else if (TREE_CODE (op) == SSA_NAME - && TYPE_SIZE (TREE_TYPE (expr)) != TYPE_SIZE (TREE_TYPE (op))) - { - error ("conversion of register to a different size in %qs", - code_name); - debug_generic_stmt (expr); - return true; - } - else if (!handled_component_p (op)) - return false; - } - expr = op; } @@ -3332,9 +3334,20 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) debug_generic_stmt (expr); return true; } + else if (require_non_reg + && (is_gimple_reg (expr) + || (is_gimple_min_invariant (expr) + /* STRING_CSTs are representatives of the string table + entry which lives in memory. */ + && TREE_CODE (expr) != STRING_CST))) + { + error ("%qs as base where non-register is required", code_name); + debug_generic_stmt (expr); + return true; + } if (!require_lvalue - && (TREE_CODE (expr) == SSA_NAME || is_gimple_min_invariant (expr))) + && (is_gimple_reg (expr) || is_gimple_min_invariant (expr))) return false; if (TREE_CODE (expr) != SSA_NAME && is_gimple_id (expr)) -- 2.35.3