From patchwork Thu Dec 7 20:11:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 57359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 615BD27BBEA; Thu, 7 Dec 2023 20:13:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E2A6327BBE9 for ; Thu, 7 Dec 2023 20:13:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBKju-0001Wy-8J; Thu, 07 Dec 2023 15:12:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBKjp-0001Wj-UY for guix-patches@gnu.org; Thu, 07 Dec 2023 15:12:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBKjp-00055i-Bi for guix-patches@gnu.org; Thu, 07 Dec 2023 15:12:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBKk1-000739-Ra for guix-patches@gnu.org; Thu, 07 Dec 2023 15:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67686] [PATCH core-updates 1/5] gnu: gcc@11: Update to 11.4.0. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 20:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67686 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 67686@debbugs.gnu.org, Greg Hogan Received: via spool by 67686-submit@debbugs.gnu.org id=B67686.170197994327040 (code B ref 67686); Thu, 07 Dec 2023 20:13:01 +0000 Received: (at 67686) by debbugs.gnu.org; 7 Dec 2023 20:12:23 +0000 Received: from localhost ([127.0.0.1]:43215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBKjO-000722-TU for submit@debbugs.gnu.org; Thu, 07 Dec 2023 15:12:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBKjK-00071g-Gs for 67686@debbugs.gnu.org; Thu, 07 Dec 2023 15:12:21 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBKj1-000427-9X; Thu, 07 Dec 2023 15:11:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=xpLE8uM/pyr1EJZ7nBsFXwz+LT9sHXdyXh9tNGmgJX8=; b=nrjNNlEZoxMHfhYlAIxO BbxfdfwMNQJVrHtt+i2b0k/hGEhLXdQdtOfm3Pqd0XlrraBq0rrIGI59NSPKWvcXhpn6djmgsAnFa Lp1lvW72ewa6YcRbUcbO+I6AJ4ZdLwys6X/+Eccwj7usAfNyKAViDhpUl3LxxEtGhF1dy3RWpPev1 A5dnRs0XZ1oBJmdaQT9QHI0zy62lco5YRFjl2jlOgPMq/kUELUSIbDWh8tcsVpN+afCxIWkDb1LB3 mMzCIFAkTnVSxyvE39V//5kZcIpo6gHMRLFdV9XcUycZnn3hHqcIP5ECyMOOh8IIDm1PDBdHZB811 cf1ZKVX26g7lRQ==; From: Janneke Nieuwenhuizen In-Reply-To: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Thu, 7 Dec 2023 11:22:44 +0100") Organization: AvatarAcademy.nl References: <84287ec2c97471228f0b4e1db1ae14b155bbde88.1701943221.git.ludo@gnu.org> X-Url: http://AvatarAcademy.nl Date: Thu, 07 Dec 2023 21:11:54 +0100 Message-ID: <8734wd93hx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès writes: > From: Greg Hogan > > * gnu/packages/gcc.scm (gcc-11): Update to 11.4.0. > Remove ‘gcc-10-tree-sra-union-handling.patch’. > * gnu/local.mk: Delist patch. > * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: Delete. [On core-updates] this patch is still used, I recommend the attatched squash commit. From aa0896545b283adc2c7451bbccca2b391a5affb8 Mon Sep 17 00:00:00 2001 Message-ID: From: Janneke Nieuwenhuizen Date: Thu, 7 Dec 2023 21:04:31 +0100 Subject: [PATCH] squash! gnu: gcc@11: Update to 11.4.0. Do not remove and delist this patch, it's still used by gcc-10. * gnu/packages/patches/gcc-10-tree-sra-union-handling.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: Iff8c9151326c87cb13db9c5b1a00c44b8eef95e3 --- gnu/local.mk | 1 + .../gcc-10-tree-sra-union-handling.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 gnu/packages/patches/gcc-10-tree-sra-union-handling.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7ecc828003..231488a1be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1250,6 +1250,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-10-cross-environment-variables.patch \ %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ + %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch \ %D%/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch \ diff --git a/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch b/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch new file mode 100644 index 0000000000..aae5fc9f72 --- /dev/null +++ b/gnu/packages/patches/gcc-10-tree-sra-union-handling.patch @@ -0,0 +1,33 @@ +Fix a regression in GCC 10/11/12 where some union structures +could get miscompiled when optimizations are enabled: + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105860 + +Taken from upstream: + + https://gcc.gnu.org/g:16afe2e2862f3dd93c711d7f8d436dee23c6c34d + +diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c +index 09d951a261b..420329f63f6 100644 +--- a/gcc/tree-sra.c ++++ b/gcc/tree-sra.c +@@ -1647,7 +1647,18 @@ build_ref_for_offset (location_t loc, tree base, poly_int64 offset, + static tree + build_reconstructed_reference (location_t, tree base, struct access *model) + { +- tree expr = model->expr, prev_expr = NULL; ++ tree expr = model->expr; ++ /* We have to make sure to start just below the outermost union. */ ++ tree start_expr = expr; ++ while (handled_component_p (expr)) ++ { ++ if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == UNION_TYPE) ++ start_expr = expr; ++ expr = TREE_OPERAND (expr, 0); ++ } ++ ++ expr = start_expr; ++ tree prev_expr = NULL_TREE; + while (!types_compatible_p (TREE_TYPE (expr), TREE_TYPE (base))) + { + if (!handled_component_p (expr)) base-commit: 941456404cc52da9492836150cbcfa44f6a476e7 -- 2.41.0