From patchwork Fri Oct 4 09:29:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 1992656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=D2Jn8KG0; 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 4XKjvS4cnCz1xtH for ; Fri, 4 Oct 2024 19:30:28 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 44E883845158 for ; Fri, 4 Oct 2024 09:30:26 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 62EE33849AD7 for ; Fri, 4 Oct 2024 09:29:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62EE33849AD7 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 62EE33849AD7 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728034201; cv=none; b=YL/NKsN6QkZpQ3MkWsRk8Yj2ir8WtGwvQd7kNazkk4E7Si93ELQs4MvVwWAlHXJQbFyAT4AuuLhP7qFsGFEM3qy5n0YluIHaZgh8Ch+PJZ9Pnp9Xbx5OTjYk/9Lu6FhfRiI+G/gtDyzEdrkir1Dvp/Dz61SewGVwFpx3sI5QG/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728034201; c=relaxed/simple; bh=unH5wTven0LYRfafvI0AgWxOlxNgU2zzwbjsdaftIsg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rtOu0J51UAFZjjMDCtId7mv983jC2YqTUFFBwUqe74J5VVsnno8r2r5irQy4dA6Iw2U+yHFoLr0ynqqyNeVxyORepm5g8GaKUjYpuDozrNArTxJ3n5TZYCNa/PkBzYI11T3j8jISTzBsBcgHha4Tak8bLiwjagaKNGYknXaAXr4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-42cc8782869so18696335e9.2 for ; Fri, 04 Oct 2024 02:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1728034198; x=1728638998; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=IzgvwRKp7COEPvkjyTf5pOW/CkW+hIVHShwhzMRKeYI=; b=D2Jn8KG0m+3LDhM8SM3s2nOV+lJjB2L/V1SWkIAiX4Pf3+SdU6jM79wqgJ0pbJNHiU epI6n4Npv14p2F4di2qsbUVGLIuBt/jdZrGRwO3oVhLdU4c6C3rs8VBDs6DDl3y3lqz1 FyexgIHwK3gg/KkZpTuYUxWPNuo/9gCBIxdWtKNiKqVVQiyAPiA5OANzf43gqiRfirq1 92qEgM4HxSt8L83683TIo0e6+GbwEPm6BlZJkNcPwUQ10UalsLv71b52LtiWN0V5fq9w aPCWGn6EW5/k33AuD24Wwzo6Q52n8x8DcRE0/aDzCMKViXJD9ZjkucxoJ+ZC4HXlbj7y /faQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728034198; x=1728638998; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IzgvwRKp7COEPvkjyTf5pOW/CkW+hIVHShwhzMRKeYI=; b=GAx7cwywM9QVEYWGKH0xy2K1I1HBdZeqTJX/RsshJAnPXrGGia7iiD+c5nNQCo538t A+iVoKpiEJ1F7dvlTn2p2BhEq7sza0Hh3r/aNCR8szCShPcDkgFcBpckCKNc42Sfb0M8 NtCniW/BEXGlD38dG5nQE5UQSsL71udmar62ywR6vTuoSZIFDWRNDqr52z/u6QC3x0oS Rb6BXD8ij8mvxp1iO9OEPx+QawSjUGKzC2GSX2BeyIockTae025NaOJnQeOuMQd1QbnP GVvDqHbtNOGAok9BOEU5m0n4TuswlcLkaV/kx0urU13pxMckdbsc3yCPFFMBFjLDdcAJ dOQg== X-Gm-Message-State: AOJu0YywOKHAnVtF15QwZLOH+GkPTqYjlH+h8H3IXhq2d8osctfeKNSp N+m9575+qr9wUYNklDKZb+sSU7ElmaLaoTihV49IwomHBTFBMp4o68jz7/QXz2L0cMxln3OswiQ = X-Google-Smtp-Source: AGHT+IFMm5Pq6SDzfXqB3W2jT9yjK+VHrKvBrN0Zn/nqkLWX1AUOYgKSbcLUBlHb8wwaFvR7ZV4GAQ== X-Received: by 2002:a05:600c:4f4b:b0:42c:bd27:4be4 with SMTP id 5b1f17b1804b1-42f85aa62e7mr14803965e9.8.1728034197894; Fri, 04 Oct 2024 02:29:57 -0700 (PDT) Received: from fomalhaut.localnet ([2a01:e0a:8d5:d990:e654:e8ff:fe8f:2ce6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f86b43f2dsm10933505e9.31.2024.10.04.02.29.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2024 02:29:57 -0700 (PDT) From: Eric Botcazou X-Google-Original-From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix PR ada/116430 Date: Fri, 04 Oct 2024 11:29:56 +0200 Message-ID: <2521834.XAFRqVoOGU@fomalhaut> MIME-Version: 1.0 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, 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 This is a regression present on the 14 branch only: the expander gets confused when trying to insert the finalizer of a procedure that contains a package as a subunit. The offending code no longer exists on the mainline so this adds the minimal fix to address the issue. Tested on x86-64/Linux, applied on the 14 branch only. 2024-10-04 Eric Botcazou PR ada/116430 * exp_ch7.adb (Build_Finalizer.Create_Finalizer): For the insertion point of the finalizer, deal with package bodies that are subunits. diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index e594a534244..123abb63289 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -2051,6 +2051,12 @@ package body Exp_Ch7 is and then List_Containing (Finalizer_Insert_Nod) = Stmts) then Finalizer_Insert_Nod := Last_Top_Level_Ctrl_Construct; + if Nkind (Finalizer_Insert_Nod) = N_Package_Body + and then Nkind (Parent (Finalizer_Insert_Nod)) = N_Subunit + then + Finalizer_Insert_Nod := + Corresponding_Stub (Parent (Finalizer_Insert_Nod)); + end if; end if; Insert_After (Finalizer_Insert_Nod, Fin_Body);