From patchwork Mon Sep 15 13:01:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 120274 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 59E6E3857BB9 for ; Mon, 15 Sep 2025 13:27:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 59E6E3857BB9 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=XXtnxlCX X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by sourceware.org (Postfix) with ESMTPS id 83FD3385B500 for ; Mon, 15 Sep 2025 13:02:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83FD3385B500 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 83FD3385B500 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757941327; cv=none; b=YwKYywwKnRKmzhPEpnvtX09BXRmATTK/iaKaBj5P2guK4fC/Y6RqsOMv6n/7vBQDux/tmmFz/BTbzfmxjPg860icdUZ5R8nTr5b4hDm1vIuwM29PNrIIQILSLLa+V3uw9s6STNjDU0TsxDfQrVYCmxth4Q+AnwBPnEfIOaJnKVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757941327; c=relaxed/simple; bh=YU+6a88rLa8LMasQDq9zb296Nqb44Ydn+Q37uFpHd0Q=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Zg1dwd1Tp++mmSJnBqBOWyb74UkqcLMn8URhGqkDqb9oZ4/J3DU89gR3U5wEINLtigywrM7KTY6LAcgNDMJrUUKJ3Re8oQmDacYIbmU9aQfih7lyxfiwEa/pDR/3X00SDR7DEPMI4gxuy44DUem/vobHRdMFwdxddrY7sa+o26w= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83FD3385B500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45f2fa8a1adso4867045e9.1 for ; Mon, 15 Sep 2025 06:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1757941326; x=1758546126; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XKfKAxiGo1+v/Sznj7Ypceo7McroehMWnieQiSOMahQ=; b=XXtnxlCXOSP41gLMNfDq/9MjzKXjRbvAg3FPmTG2Hqoz4UQYCwhjaANfMjo9Gd/e7c BVGlepjtdPx7CXz93yqJvlgmA7xhNMOi1LZ+BKrQiiNWFE2Q7OhVptsV2ue0V3jn1Vse RnqAO895ehT7vSzI+GNlBMIUpfVfRTKQDEz6Ulhe3CO/NxXie276+nlwgizUNgRrMr5Y C4dQy7Z7+hCnZLq4s2Ys3JHchb+dB7vFHB95lkdqhs8gCc1RVlDGtjrwJc4ArDrtjj0S abUKrSKn55Yc407momVJkg0YwixhYA45gSxPhKbHYuAK0XhHhR1aMVdbGYdxPCgs/W7y pusQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757941326; x=1758546126; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XKfKAxiGo1+v/Sznj7Ypceo7McroehMWnieQiSOMahQ=; b=FxY0f+nAkXxOQQzv/MHn3T/4sWl3qm7yQ93koAN1dJTYNfT8jdBsE8rWex2zBUTTun Lv0riBiasAArB2vDQOnkMdMO5OA0Z2lkeX7o2jUwenMX5/IuxbR50Wz4ptWc8Xv9Fine mmqTXlLCPHC+5AzK1IN/Uzj8ZluTFt7m6+Jw8JacejqO2tV9saOd8O0iYhAiXwaboMEZ 3mfnACClP42Xdgilrvhl/I/Zw5EruDfurigGejm8R9wllRQ7+TZcyp8EWnzCyUlyDCgC /Vn3NrFsxdstdZ/O+73UlaCdbWtBBdJU6vgFuK8A+0f7oLES+HJ5Yfm0jv2cIS5Kxb1j oY5A== X-Gm-Message-State: AOJu0YzuOeFXFwzDHwrVatNy5vwIDMEj1PXBYkFLLWFX+QCDkGMEwl9M G3QfMgJt3ym3jcD/Rb54iyo0r5C/SrU7CJ5C2uQGj9IKNc6khC5ByxpkGid1ViRpKEnSUHg/qGJ qf4w= X-Gm-Gg: ASbGnctEg0EdUUvL9mTNgAbsslOTkadQ0slc7I9nZYT/DQPWRjw2uooCtHxPvWWY8td AOYKyAs5+DlXUm2QDeg0Wmpo5rr7G9J1yGzeiOF+rOPAymw0XRiBlwDO0VpTOwAxMnRgjoVcpqn kJbI7+2r9ksa+wc9QYCuDt/VnVV3fOsDwuhPBUPIzvnaKQ8hmfqrKwrwIH72OJSEHWOjG15/R9n RjvSi1FzoOputOCJU6PKgCu/U61D+CkOeY35NsCe9H5Ma2W1/k1EJem9lTUvOQvU9kRmHWifydo 6+0vXOaWym89YB4KXPJjxa+cqDi5PPDTfUCpE0AJ4k8zLwyafYokslQlf75GQfG29oLEehGzdE8 1F2vbGnk0YIMJ8qnf/wnD4Hfq/9hUzGgPLquJv0Bq/E/bmrago7o+0G4Bp7Nf1UaOVBW2hwYtWU XG2zfhPpL/mfmEws4OVEOmnCnUH1NuQ8slsP19om+bgeqUqmvw X-Google-Smtp-Source: AGHT+IEjE105cPoKY2oehQiYD2DZAVmfDhqWytnkY83qbDtWA7ZEX/WXbGJRl5+uTXOK9zQlXT1c8Q== X-Received: by 2002:a05:600c:40c4:b0:45d:e775:d8b8 with SMTP id 5b1f17b1804b1-45dfd5aaff0mr114267475e9.1.1757941326020; Mon, 15 Sep 2025 06:02:06 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3ea4b52b7fcsm5428733f8f.33.2025.09.15.06.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Sep 2025 06:02:05 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Viljar Indus Subject: [COMMITTED 19/27] ada: Fix ghost condition for level dependencies for assignments Date: Mon, 15 Sep 2025 15:01:25 +0200 Message-ID: <20250915130135.2720894-19-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250915130135.2720894-1-poulhies@adacore.com> References: <20250915130135.2720894-1-poulhies@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.8 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 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 From: Viljar Indus gcc/ada/ChangeLog: * ghost.adb (Check_Assignment_Policies): The level of the assignee should depend on the level of the region. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/ghost.adb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/ada/ghost.adb b/gcc/ada/ghost.adb index 40075bdf0a6b..37f82ca849f7 100644 --- a/gcc/ada/ghost.adb +++ b/gcc/ada/ghost.adb @@ -1913,12 +1913,14 @@ package body Ghost is ("\& is modified in a region with `Ignore`", N, Assignee); end if; + -- If an assignment to a part of a ghost variable occurs in a ghost + -- entity, then the variable should be assertion-level-dependent on + -- this entity (SPARK RM 6.9(18)). + if Present (Region_Level) and then not Is_Assertion_Level_Dependent - (Region_Level, Assignee_Level) + (Assignee_Level, Region_Level) then - Error_Msg_Sloc := Sloc (N); - Error_Msg_N (Assertion_Level_Error_Msg, N); Error_Msg_Name_1 := Chars (Assignee_Level); Error_Msg_NE ("\& has assertion level %", N, Assignee);