From patchwork Fri May 3 10:58:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1930988 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=r3oijr35; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=iX8BasU5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1YSLYckh; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=mQHYNwuO; 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 4VW79B3Mtsz1ydX for ; Fri, 3 May 2024 20:59:26 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CC179384AB78 for ; Fri, 3 May 2024 10:59:22 +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 1E0583858C66 for ; Fri, 3 May 2024 10:59:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E0583858C66 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 1E0583858C66 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=1714733944; cv=none; b=H7Acez0+xap/I0/2CdGwIMS817uZ5JULpE+20VyJEKoDiGPtfbjc6jLIQk2bIJ7VkmrLf0ltMpUQNHlMhRWjWc3p5aCnNz6ISGX4Ai9njlqQrPqPgFUvvnMJlgQp+h+9pdJySR8N+7y8caqrmDUwzo0UYrJZnA/G8zp6wNs1s5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714733944; c=relaxed/simple; bh=Jc/aPX7O35GyLC/VhFJZApMCDIJpBjWJMhZjq3XRul0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=ElAU6okCgxgMGKxZCu/mVudX4y68vOvswwUTe49I+8ySI6xj1z0Yls6TrhIZ2EjMs3/eO3TGx1LKa17gnzIXVWAE+EPBU8C7jwUpfLoSZJ2OouvhVUEAGLewMeC5Bwky0xCLFFHHtAkUaqzl0j11axlqyQByeC/T3hYKRxCG+z4= 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-out1.suse.de (Postfix) with ESMTPS id DD3DE3382D; Fri, 3 May 2024 10:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714733940; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=UHczJSZ+ywxaEKyVtBGldCG4G5z4C7TP3+gDMmq/4P8=; b=r3oijr35K26U3DB9n3NZB3aj4G6yHtjo2ykPh93xEqoV/r7npNH+/nmAE2TmgwiCUnWIlI Qpmf7PaTSJYKPfpu4ZTtz/aA7OmsN5NINReGXYSHASeQ7OzX01ULqk4mFYnGqdwGGrTtUp QZV8eynt8DOFhkqDsdHnUTpCCnAs+W0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714733940; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=UHczJSZ+ywxaEKyVtBGldCG4G5z4C7TP3+gDMmq/4P8=; b=iX8BasU5ylXVv9ncTipv16ZAwhd35RSJUYejTPjayZQm8G78PJ6DlIrPZcL0pr+9t7yrpt 3bAgEULtNXXP0OAQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=1YSLYckh; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=mQHYNwuO DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714733939; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=UHczJSZ+ywxaEKyVtBGldCG4G5z4C7TP3+gDMmq/4P8=; b=1YSLYckhTWF3BqsXI0c8nY9I+2D4cYfVtKC8Gyel9Ws79WbSFo9/cz3ZIT35LHdUKy52AN a5y5I33LAS+ZkE8lQ5emVJ2KHT8Pi4tQ/heaGg5E8R/1SOBSvBr9T0oBN+jO6ucnG19t/S LDRqPlgccNz0WRO2YUoVHuroK7P9ELg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714733939; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=UHczJSZ+ywxaEKyVtBGldCG4G5z4C7TP3+gDMmq/4P8=; b=mQHYNwuOsqYL4K6Je1+kKOGEwOeaYRVPa6k3jXHeG6tPTtAvL2ClUm9W4v5PNVdvoPGOoP CcAJ7Q6EyXzwOiBw== 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 BA03313991; Fri, 3 May 2024 10:58:59 +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 iMpJK3PDNGa0TwAAD6G6ig (envelope-from ); Fri, 03 May 2024 10:58:59 +0000 Date: Fri, 3 May 2024 12:58:55 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek Subject: [PATCH] Avoid changing type in the type_hash_canon hash MIME-Version: 1.0 Message-Id: <20240503105859.BA03313991@imap1.dmz-prg2.suse.org> X-Spam-Score: -6.42 X-Rspamd-Action: no action X-Rspamd-Queue-Id: DD3DE3382D X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-6.42 / 50.00]; BAYES_HAM(-2.91)[99.62%]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Status: No, score=-11.6 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 When building a type and type_hash_canon returns an existing type avoid changing it, in particular its TYPE_CANONICAL. Bootstrapped and tested on x86_64-unknown-linux-gnu for all languages. OK for trunk? Thanks, Richard. PR middle-end/114931 * tree.cc (build_array_type_1): Return early when type_hash_canon returned an older existing type. (build_function_type): Likewise. (build_method_type_directly): Likewise. (build_offset_type): Likewise. --- gcc/tree.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gcc/tree.cc b/gcc/tree.cc index 83f3bf306af..780662549fe 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -7352,7 +7352,10 @@ build_array_type_1 (tree elt_type, tree index_type, bool typeless_storage, if (shared) { hashval_t hash = type_hash_canon_hash (t); + tree probe_type = t; t = type_hash_canon (hash, t); + if (t != probe_type) + return t; } if (TYPE_CANONICAL (t) == t && set_canonical) @@ -7509,7 +7512,10 @@ build_function_type (tree value_type, tree arg_types, /* If we already have such a type, use the old one. */ hashval_t hash = type_hash_canon_hash (t); + tree probe_type = t; t = type_hash_canon (hash, t); + if (t != probe_type) + return t; /* Set up the canonical type. */ any_structural_p = TYPE_STRUCTURAL_EQUALITY_P (value_type); @@ -7663,7 +7669,10 @@ build_method_type_directly (tree basetype, /* If we already have such a type, use the old one. */ hashval_t hash = type_hash_canon_hash (t); + tree probe_type = t; t = type_hash_canon (hash, t); + if (t != probe_type) + return t; /* Set up the canonical type. */ any_structural_p @@ -7720,7 +7729,10 @@ build_offset_type (tree basetype, tree type) /* If we already have such a type, use the old one. */ hashval_t hash = type_hash_canon_hash (t); + tree probe_type = t; t = type_hash_canon (hash, t); + if (t != probe_type) + return t; if (!COMPLETE_TYPE_P (t)) layout_type (t);