From patchwork Tue Jun 14 15:31:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 55075 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 9E65E383D82F for ; Tue, 14 Jun 2022 15:32:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from anteater.oak.relay.mailchannels.net (anteater.oak.relay.mailchannels.net [23.83.215.3]) by sourceware.org (Postfix) with ESMTPS id 0A36E385AE68 for ; Tue, 14 Jun 2022 15:32:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0A36E385AE68 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 47E6A762462; Tue, 14 Jun 2022 15:32:14 +0000 (UTC) Received: from pdx1-sub0-mail-a304.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 52046761866; Tue, 14 Jun 2022 15:32:03 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1655220723; a=rsa-sha256; cv=none; b=BN9VZD1jecAIf1QQ3aJ5D9A3N0gpdm0Oz8AXIAoqGJRsHSrnlcUbJiZJkouafW6Ge38UwE SYJ+zg/xnsOoSDjz3lc9x+0WWIzsUKNsLUI7ZJ3owIh70I/M+F0A1Q2K6u4mQc4z6kwJYG r6gUn/7jFHD7BqG7OVhx00x8hJSLrMxXb22sPkYnlY9bgGaP2RbdS+O57QJ20z4RCAqNvH Khf2r4UmLNRhu5x7PPyqM2LY71DLD0H0kgShWmzq2RhmpeH64cDx8Y8meB8Nlq7T+x3Phh Q6KBh05ADfXUg0PaztaS1FBnKEf+K6L9vtgf/IeWCHOEv+I64hIlYPVN/LcvKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1655220723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=djb+KurOPzFEoDuN663OvuSimc2WBDbhmKazlFzBdyc=; b=VoqXtNgh+xZGgcBW/z4ojJuqfHgQkqJDMazErsdJCo0ZkN5UcvMQuVLDAZ0GZvgcT6KPqf do8Ry8Mw3jccCn4NmUUQe0uP0asTkq2c+oFnGFuUkQgva4cuS3e0/JytwdR5wg7evXTL01 FLtqIt2oH6aaqQNoRxW9PQ6iC1nbPWU4i8FvOOB9EoIwOaji0EbOvWwMNVaHrblQUaMJCW Q4AUb7dC5r3+M0WarGDo0zRP8qUbpOvu30fnni+NINUYHIPObYdVd/JGT7l3RPEF3Hz+ZJ tbVacz1crKal8Ug/kebudqeeZSxELsfXD8qH0OP2LQqjfAYMWCteOxMoPekJNA== ARC-Authentication-Results: i=1; rspamd-848669fb87-4kqjt; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org Received: from pdx1-sub0-mail-a304.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.98.242.216 (trex/6.7.1); Tue, 14 Jun 2022 15:32:03 +0000 Received: from rhbox.redhat.com (unknown [1.186.122.115]) (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) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a304.dreamhost.com (Postfix) with ESMTPSA id 4LMsqj4SnnzLJ; Tue, 14 Jun 2022 08:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1655220722; bh=djb+KurOPzFEoDuN663OvuSimc2WBDbhmKazlFzBdyc=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=pjScDinSE2j0EwqLp2JLYN/t5Dwx5Xw7h5VvJ7lumA53mpbf0EHFGZJVdqswROqas MOYhUBbTRKas2mGnleZyr5a8mJ5aItyVFzRr665VPay03HqTJAbr+KB1SP++eUZNEb ePAqsBKx+3WaqQiILku0BY9kN8v0r5Qo13L/fyxhMrwxJkG+VFiv8EKOH5yiMkjk6n O5qTuTyBqtIAF7fV66hkiti8Oxg4wRvBN4EqGvUQUgz0jg1Q7+p9gwtk7LprvWT1P+ Ar2iBMvvj7l1Ts/ryHSH5Y/qJxbVecQThnK4IzyafnhVQwR8fget8me54Nm9jlW4eQ 9wK46/u6Wnu5A== From: Siddhesh Poyarekar To: gcc-patches@gcc.gnu.org Subject: [PATCH v1.1] tree-optimization/105736: Don't let error_mark_node escape for ADDR_EXPR Date: Tue, 14 Jun 2022 21:01:54 +0530 Message-Id: <20220614153154.366953-1-siddhesh@gotplt.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220614152646.357680-1-siddhesh@gotplt.org> References: <20220614152646.357680-1-siddhesh@gotplt.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3037.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jakub@redhat.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The addr_expr computation does not check for error_mark_node before returning the size expression. This used to work in the constant case because the conversion to uhwi would end up causing it to return size_unknown, but that won't work for the dynamic case. Modify the control flow to explicitly return size_unknown if the offset computation returns an error_mark_node. gcc/ChangeLog: PR tree-optimization/105736 * tree-object-size.cc (addr_object_size): Return size_unknown when object offset computation returns an error. gcc/testsuite/ChangeLog: PR tree-optimization/105736 * gcc.dg/builtin-dynamic-object-size-0.c (TV4, val3, test_pr105736): New struct declaration, variable and function to test PR. (main): Use them. Signed-off-by: Siddhesh Poyarekar --- Changes from v1: - Used FAIL() instead of __builtin_abort() in the test. Tested: - x86_64 bootstrap and test - --with-build-config=bootstrap-ubsan build May I also backport this to gcc12? .../gcc.dg/builtin-dynamic-object-size-0.c | 18 +++++++++++++++++ gcc/tree-object-size.cc | 20 ++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c index b5b0b3a677c..01a280b2d7b 100644 --- a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c +++ b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c @@ -479,6 +479,20 @@ test_loop (int *obj, size_t sz, size_t start, size_t end, int incr) return __builtin_dynamic_object_size (ptr, 0); } +/* Other tests. */ + +struct TV4 +{ + __attribute__((vector_size (sizeof (int) * 4))) int v; +}; + +struct TV4 val3; +int * +test_pr105736 (struct TV4 *a) +{ + return &a->v[0]; +} + unsigned nfails = 0; #define FAIL() ({ \ @@ -633,6 +647,10 @@ main (int argc, char **argv) FAIL (); if (test_loop (arr, 42, 20, 52, 1) != 0) FAIL (); + /* pr105736. */ + int *t = test_pr105736 (&val3); + if (__builtin_dynamic_object_size (t, 0) != -1) + FAIL (); if (nfails > 0) __builtin_abort (); diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc index 5ca87ae3504..12bc0868b77 100644 --- a/gcc/tree-object-size.cc +++ b/gcc/tree-object-size.cc @@ -695,19 +695,21 @@ addr_object_size (struct object_size_info *osi, const_tree ptr, var_size = pt_var_size; bytes = compute_object_offset (TREE_OPERAND (ptr, 0), var); if (bytes != error_mark_node) - bytes = size_for_offset (var_size, bytes); - if (var != pt_var - && pt_var_size - && TREE_CODE (pt_var) == MEM_REF - && bytes != error_mark_node) { - tree bytes2 = compute_object_offset (TREE_OPERAND (ptr, 0), pt_var); - if (bytes2 != error_mark_node) + bytes = size_for_offset (var_size, bytes); + if (var != pt_var && pt_var_size && TREE_CODE (pt_var) == MEM_REF) { - bytes2 = size_for_offset (pt_var_size, bytes2); - bytes = size_binop (MIN_EXPR, bytes, bytes2); + tree bytes2 = compute_object_offset (TREE_OPERAND (ptr, 0), + pt_var); + if (bytes2 != error_mark_node) + { + bytes2 = size_for_offset (pt_var_size, bytes2); + bytes = size_binop (MIN_EXPR, bytes, bytes2); + } } } + else + bytes = size_unknown (object_size_type); wholebytes = object_size_type & OST_SUBOBJECT ? var_size : pt_var_wholesize;