From patchwork Mon Dec 4 14:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 81285 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 B0C113857B9D for ; Mon, 4 Dec 2023 14:34:01 +0000 (GMT) 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 3F6223858C98 for ; Mon, 4 Dec 2023 14:33:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F6223858C98 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 3F6223858C98 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=1701700426; cv=none; b=rWepV5giWhuWs/DH6BGO7vRVV7IXCQXGzdBSS+HITYQJ0WNDDzfafh4OhC8MNF8w6y6mvb23KLLivsNnnyTVFv2ObcZtCwY770cX/0PTPuaAgMMWji0jklud1DTXccxvYxsWN2W0dwYHCOYS4z9iJ7Ux/wAwoLmq3fL9TFtDfxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701700426; c=relaxed/simple; bh=dh9UmPipp8nW953iR80d8VNy+CB2s6Ly43WHKLcyPts=; h=Date:From:To:Subject:MIME-Version:Message-Id; b=u5UgcP8uTl3NXkN3rGd9ILL7PzmB5cb9YfnwFSWvu2edVEMb0T6B1CB7VCN/FdK7F6/3smPaJqq7gt2o2qkOBLzYXyT+qRk1XIo/QBcKmctepcMAQl40cnCZsSgik+nipm4S6IGfwBGPROvI8u4UuObZKVCVlUkj67MCUWnYU4E= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (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 383E821BF3 for ; Mon, 4 Dec 2023 14:33:42 +0000 (UTC) Received: from imap2.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 imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 1EBC4139E2 for ; Mon, 4 Dec 2023 14:33:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id btHbBUbjbWX0FQAAn2gu4w (envelope-from ) for ; Mon, 04 Dec 2023 14:33:42 +0000 Date: Mon, 4 Dec 2023 15:33:41 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] middle-end/112785 - guard against last_clique overflow MIME-Version: 1.0 Message-Id: <20231204143342.1EBC4139E2@imap2.dmz-prg2.suse.org> X-Spamd-Bar: +++++++++++++ X-Spam-Score: 13.04 X-Rspamd-Server: rspamd1 Authentication-Results: smtp-out1.suse.de; dkim=none; spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:98 is neither permitted nor denied by domain of rguenther@suse.de) smtp.mailfrom=rguenther@suse.de; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=suse.de (policy=none) X-Rspamd-Queue-Id: 383E821BF3 X-Spamd-Result: default: False [13.04 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:98:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(2.93)[0.978]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; TO_DN_NONE(0.00)[]; R_SPF_SOFTFAIL(4.60)[~all:c]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[]; NEURAL_SPAM_LONG(3.50)[1.000]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(2.20)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.18)[70.42%]; DMARC_POLICY_SOFTFAIL(0.10)[suse.de : No valid SPF, No valid DKIM,none] X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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.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 The PR shows that we'll ICE eventually when last_clique wraps. The following avoids this by refusing to hand out new cliques after exhausting them. We then use zero (no clique) as conservative fallback. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR middle-end/112785 * function.h (get_new_clique): New inline function handling last_clique overflow. * cfgrtl.cc (duplicate_insn_chain): Use it. * tree-cfg.cc (gimple_duplicate_bb): Likewise. * tree-inline.cc (remap_dependence_clique): Likewise. --- gcc/cfgrtl.cc | 2 +- gcc/function.h | 11 +++++++++++ gcc/tree-cfg.cc | 2 +- gcc/tree-inline.cc | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gcc/cfgrtl.cc b/gcc/cfgrtl.cc index abcb472e2a2..2a3f853eed5 100644 --- a/gcc/cfgrtl.cc +++ b/gcc/cfgrtl.cc @@ -4385,7 +4385,7 @@ duplicate_insn_chain (rtx_insn *from, rtx_insn *to, { gcc_assert (MR_DEPENDENCE_CLIQUE (op) <= cfun->last_clique); - newc = ++cfun->last_clique; + newc = get_new_clique (cfun); } /* We cannot adjust MR_DEPENDENCE_CLIQUE in-place since MEM_EXPR is shared so make a copy and diff --git a/gcc/function.h b/gcc/function.h index 29846564bc6..833c35e3da6 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -518,6 +518,17 @@ set_loops_for_fn (struct function *fn, struct loops *loops) fn->x_current_loops = loops; } +/* Get a new unique dependence clique or zero if none is left. */ + +inline unsigned short +get_new_clique (function *fn) +{ + unsigned short clique = fn->last_clique + 1; + if (clique != 0) + fn->last_clique = clique; + return clique; +} + /* For backward compatibility... eventually these should all go away. */ #define current_function_funcdef_no (cfun->funcdef_no) diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index a30a2de33a1..475ea5d99ef 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -6595,7 +6595,7 @@ gimple_duplicate_bb (basic_block bb, copy_bb_data *id) if (!existed) { gcc_assert (MR_DEPENDENCE_CLIQUE (op) <= cfun->last_clique); - newc = ++cfun->last_clique; + newc = get_new_clique (cfun); } MR_DEPENDENCE_CLIQUE (op) = newc; } diff --git a/gcc/tree-inline.cc b/gcc/tree-inline.cc index e6d553059e3..a4fc839a22d 100644 --- a/gcc/tree-inline.cc +++ b/gcc/tree-inline.cc @@ -1002,7 +1002,7 @@ remap_dependence_clique (copy_body_data *id, unsigned short clique) /* Clique 1 is reserved for local ones set by PTA. */ if (cfun->last_clique == 0) cfun->last_clique = 1; - newc = ++cfun->last_clique; + newc = get_new_clique (cfun); } return newc; }