From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id A093E3858CDA for ; Tue, 7 May 2024 08:00:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A093E3858CDA 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 A093E3858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::333 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715068807; cv=none; b=q1iezLpGSgdl8+C49VHLgzCllji47nYFPEg7T7Kow7mWchGsgHCvKAWKCYRa+aH6Xgu38QluBtfai6xH30Ai1HjWciJrf3sOqeKjShiZ7xXziXdVdKMuRg84euTv75yDyGZGGxO+aKX92x6afpUZJgpaq+ij4VtUBmVvlCYJYLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715068807; c=relaxed/simple; bh=6t0Uk1AKUGYd+BAGn693eSEpQ/eMzhqErXYVNzh39Bc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=gadKd9Ov9MUSpVeY+oyXdK51g8crDK+3tAdhT3ZBcGBY7GxK7fKGYk4qQd6fqVXkNnq1eAW1uQwbG8ptEoODfYlRdXYaOK5Q/K0l2w/QNiNn52J0tF/NIkK+YYGuxeUCCMQ2jtIrqhPcOtWF/KT1ug6KhqBVydA9u4Rj8CbMVSI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-41b7a26326eso20983795e9.3 for ; Tue, 07 May 2024 01:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715068804; x=1715673604; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=csutlQteuM5xjZl28pzpmJirgznkyB18U6X+0mQHvh0=; b=cEtz1XPpJOMFjatih9wuO5vRg+NjRgIJeQRyghhoa60SAJTrSVSIwFdXe/q8kLvkvW xee/hKyBJnqF7mBAqapeaEOnBEkPVSDvj42x0SsUhT9cIfJO+s2qsZdLuLAGBNC3y/1N K0dbPaZn+Ne1XxNc+WUMt7RW16kwqb7Stq3iyZLRBmxXNWQ2KBJ/+LuaG79M0DXAT5t+ hFwy+wOeDfEacqeILtEm9YJPgHXebsWA4rYNz4phd1HvvUOuE7jxZnuI35if5COs5GoN adykGyvkSTeO4zYlcMUDT9VIWOF2kQXJNAWNazxif4W4oV8/2GYz+P4zUssYaVn66m3/ AVYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715068804; x=1715673604; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=csutlQteuM5xjZl28pzpmJirgznkyB18U6X+0mQHvh0=; b=X4fh/9kQHANleHT2KOQEWJsjfmahPD+AVA9MIgG3MXhFIjMFaXLakPDo2kPOTWKDvd nSHtMTpMI0JJGPBB5SpO0d2zZ+9m+qmMcW4853ioetStPyyCIaRZONLnc/HOR5qpi1jc 7YhJwsfw+qEXvxjT1gEpW9r0n2o4ylExFVuGCDgXPR4xBScengG6pg/kdR07ej1euiZe 1rc+CjfQZFgtn2ziUyJ+ON1NV14jyiIllq2SghX1I92p9n7ydfgFDgdrJGJBfvqStuMi QcY4YHxVhGQdYYDdyQy5IecT0ynRpZKujt57WOKwS4SOc6T5xZD3DuI8jurr4FAsXcTE TGlw== X-Gm-Message-State: AOJu0YxXeAfqPPGWIUlPswNEZ6RzG8wesHl/yZu4SBKHEc7NXxutH6Xb qcTyRySpZ2YemazTAArLJhg10CMSRrGZ3zjq0oyc5udQcNUtihVPGjwc7QPv/zqRa8cJzWy9YSs = X-Google-Smtp-Source: AGHT+IGXGxNPBxhbmMNNXrxdxZiPQ5nu2/HRujDWyGE68CXhKmeGmCixoHN6RqKyl+nX0qt0yAFFSA== X-Received: by 2002:a05:600c:3ac9:b0:41b:b07a:c54c with SMTP id d9-20020a05600c3ac900b0041bb07ac54cmr10049138wms.9.1715068804322; Tue, 07 May 2024 01:00:04 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:11a6:1c9d:5099:b1e8]) by smtp.gmail.com with ESMTPSA id n21-20020a05600c3b9500b0041a9fc2a6b5sm22299038wms.20.2024.05.07.01.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 May 2024 01:00:03 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [COMMITTED] ada: Fix spurious error on generic state in SPARK Date: Tue, 7 May 2024 10:00:02 +0200 Message-ID: <20240507080003.36830-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: From: Yannick Moy The public state of a generic package needs not be part of the state of the enclosing unit, only the state of instantiations need to be accounted for in the enclosing package. Now fixed. gcc/ada/ * sem_util.adb (Find_Placement_In_State_Space): Stop search for placement when reaching the public state of a generic package. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 3af029fd9a3..d629c76fd47 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -9103,6 +9103,14 @@ package body Sem_Util is Placement := Private_State_Space; return; + -- The item or its enclosing package appear in the visible state + -- space of a generic package. + + elsif Ekind (Pack_Id) = E_Generic_Package then + Placement := Not_In_Package; + Pack_Id := Empty; + return; + -- When the item appears in the visible state space of a package, -- continue to climb the scope stack as this may not be the final -- state space. -- 2.43.2