From patchwork Sun Oct 13 10:50:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1996505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.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=mOkOzMK0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yQ/AW5bf; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mOkOzMK0; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yQ/AW5bf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XRHGH64jmz1xsc for ; Sun, 13 Oct 2024 21:51:01 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 25378385AC21 for ; Sun, 13 Oct 2024 10:50:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 6DD8E3858C32 for ; Sun, 13 Oct 2024 10:50:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6DD8E3858C32 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 6DD8E3858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728816636; cv=none; b=MbBT4xdrZCdEpfY1Yf08HhuR8YG/mRlz12XPfui0o35oZNwET3V/R08hA/WZOTuhF3J7vOppffyvfefPoE+PC8XRxcEHyt9lmRVUBASTjevNjMsnWwlaYP/v4ze+5jru4h3a+7be1QIeWEEZ0hahe/i/9UJQbiPYt4hH8FpzLe0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728816636; c=relaxed/simple; bh=crcGGWzuin/ft3XVNar6s571YfV3NaOEYcRpGmyr7Sc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=dFNgDe36O3o9U/wpF6q9BbXjQ1w6l0MuOVEXOR0p0WJ2uHjMtS+k+z+kEK/CCu+lksuo6xEkXh/SpYJN1oMzlWEpmjtttQy8ar9vRdupmZJ+ET6SzgbsOE2B+iM5+aC1R5fBl+ll//Q3+QppbNg+wwUX2hlp5aluMUWjG6wuefY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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-out2.suse.de (Postfix) with ESMTPS id 426751FDC0; Sun, 13 Oct 2024 10:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728816632; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=I0fFxsb4u7tmDis2f8MuU7/ObTZf90KJ/HUZGy9hNDQ=; b=mOkOzMK0A5sv5nvmwZDGaTYKzHh1nNOOaLtjjaLUsN6LJGKkrWCAFBImlmzAcezGEEDoSU fn0aransGik0FMkAi7VtnbUaf6ASOCrDHDwPDeOH3D+pJI6smZaP359wswFU1nPJ7XNkxV 4zMV8dSaCMhyD5vryGqkLeffwoJHo2Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728816632; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=I0fFxsb4u7tmDis2f8MuU7/ObTZf90KJ/HUZGy9hNDQ=; b=yQ/AW5bfcd+guS3ZGOMA4+kaixDEFphGCqcnrHNA7rlU1YnXtQfF32//Df94Q7Nk8+AO+8 nrsMooudU0gCIgAg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mOkOzMK0; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="yQ/AW5bf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728816632; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=I0fFxsb4u7tmDis2f8MuU7/ObTZf90KJ/HUZGy9hNDQ=; b=mOkOzMK0A5sv5nvmwZDGaTYKzHh1nNOOaLtjjaLUsN6LJGKkrWCAFBImlmzAcezGEEDoSU fn0aransGik0FMkAi7VtnbUaf6ASOCrDHDwPDeOH3D+pJI6smZaP359wswFU1nPJ7XNkxV 4zMV8dSaCMhyD5vryGqkLeffwoJHo2Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728816632; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=I0fFxsb4u7tmDis2f8MuU7/ObTZf90KJ/HUZGy9hNDQ=; b=yQ/AW5bfcd+guS3ZGOMA4+kaixDEFphGCqcnrHNA7rlU1YnXtQfF32//Df94Q7Nk8+AO+8 nrsMooudU0gCIgAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1EF2213A42; Sun, 13 Oct 2024 10:50:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id fPluBfilC2cpMQAAD6G6ig (envelope-from ); Sun, 13 Oct 2024 10:50:32 +0000 Date: Sun, 13 Oct 2024 12:50:31 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek Subject: [PATCH] tree-optimization/116481 - avoid building function_type[] MIME-Version: 1.0 Message-Id: <20241013105032.1EF2213A42@imap1.dmz-prg2.suse.org> X-Rspamd-Queue-Id: 426751FDC0 X-Spam-Score: -4.51 X-Rspamd-Action: no action X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; MISSING_XM_UA(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Level: X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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~incoming=patchwork.ozlabs.org@gcc.gnu.org The following avoids building an array type with function or method element type during diagnosing an array bound violation as this will result in an error, rejecting a program with a not too useful error message. Instead build such array type manually. Bootstrapped and tested on x86_64-unknown-linux-gnu, OK? Thanks, Richard. PR tree-optimization/116481 * pointer-query.cc (build_printable_array_type): Build an array types with function or method element type manually to avoid bogus diagnostic. * gcc.dg/pr116481.c: New testcase. --- gcc/pointer-query.cc | 11 +++++++++++ gcc/testsuite/gcc.dg/pr116481.c | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr116481.c diff --git a/gcc/pointer-query.cc b/gcc/pointer-query.cc index c8ab0571e57..a85c04128ff 100644 --- a/gcc/pointer-query.cc +++ b/gcc/pointer-query.cc @@ -2587,6 +2587,17 @@ array_elt_at_offset (tree artype, HOST_WIDE_INT off, tree build_printable_array_type (tree eltype, unsigned HOST_WIDE_INT nelts) { + /* Cannot build an array type of functions or methods without + an error diagnostic. */ + if (FUNC_OR_METHOD_TYPE_P (eltype)) + { + tree arrtype = make_node (ARRAY_TYPE); + TREE_TYPE (arrtype) = eltype; + TYPE_SIZE (arrtype) = bitsize_zero_node; + TYPE_SIZE_UNIT (arrtype) = size_zero_node; + return arrtype; + } + if (TYPE_SIZE_UNIT (eltype) && TREE_CODE (TYPE_SIZE_UNIT (eltype)) == INTEGER_CST && !integer_zerop (TYPE_SIZE_UNIT (eltype)) diff --git a/gcc/testsuite/gcc.dg/pr116481.c b/gcc/testsuite/gcc.dg/pr116481.c new file mode 100644 index 00000000000..3ee6d747087 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr116481.c @@ -0,0 +1,13 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Warray-bounds" } */ + +extern void tramp (); + +int is_trampoline (void* function) /* { dg-bogus "arrays of functions are not meaningful" } */ +{ + void* tramp_address = tramp; + if (!(((unsigned long)function & 3) == 2)) + return 0; + return (((long *) ((char*)function - 2))[0] + == ((long *) ((char*)tramp_address-2))[0]); /* { dg-warning "outside array bounds" } */ +}