From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 37D513882079 for ; Thu, 13 Jun 2024 13:34:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 37D513882079 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 37D513882079 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718285657; cv=none; b=aTJTPOaN5LT8gxWT0MMJbrhVhuAOHWK26Ltajj+LaeYZP3NfiYBC6FYykr+gViD1eJg161LCX7RxJpJMRz6VqOz7/NP7rh22iMfwic05O3HIy5Vkx+c2gool57J6+x5vgSEwTLjv/Rj3KVpM5sNIzmoT+WRFTY7N8zODriuoNTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718285657; c=relaxed/simple; bh=cqffY2Yk7eikBEvKKztmQVLXniiYGfWKujj+/7uXzik=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Mhv58mB+dseformI9M/XMgX77ylLf0rVfe9Jaa+QRIYiCE9KU1tJ+Bi+HNNXyMsSlBfspoa/ZwBYw3FJMvsn0CP4wOW7bNxxycFYpFDBswpeQuQK1grkWAxRPBaVBH4K+7B74cwTn0Kf9YVCv6oDkiIC9/I+l7JQrQJh8paAVFc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-42108856c33so13537905e9.1 for ; Thu, 13 Jun 2024 06:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1718285645; x=1718890445; 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=DUd/yTkFhxNdq1trEoGxiN3fv7IgweNsFZCVyqSpXKA=; b=RA214zhFVVKJoNcrS56yLyrVBQlGAl4jjvrDqcaUXxCHLA20fvEnBb0hUVEENe0dTW UDWPgGlc0izfGWjdNhyIZLzZepq7XaI/lmKuF8Wze5P4wr2t1OOTSLSdntaCsjVBEAqo e5oOeXhKEhqJAVn/UPUWVvJAtfQjpcwKXthUScccfYqH5UYHdoOKYwT7DSrnROu6yLDn ocAREdafdaPJBMP5aISDjiCg3mjmZzmigax8oIO5oBfN33wdXCX+hzuiowJl9WyqSSPE PU+sDR/0/z3L/UAg7pdk4obsu3Tkexf80JKwXmFQBEXS42pwAZqF1UMR3/aU4VQ0tJ8w ca3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718285645; x=1718890445; 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=DUd/yTkFhxNdq1trEoGxiN3fv7IgweNsFZCVyqSpXKA=; b=KB+O4jfG22YF7v4N7jyC17CzB9dEcbwYjPnxj0hK5C9hqxzZIHTBNUGKX2MUa2MLvO BYKHegqVZ5rTU87dK6rvDwYSMxAkPOvIzkwiJvXhGYKWTssNnpa5PawoXQIan4s5YZn2 PIQOxSDINaWOJNz2CXPOlRu25tq6QPdptwRHFvy3rrAbB9INDYVoaTcV8KW9aBeDAGXL laMZqp3XGKwYQtRAAjaQ12hL71L9kVy8lKLcYRXvJLBB7uoWK0X0VygrOCYxYI0Dth8d o8vYuAqK25F/DNMrebci6QqZ6OdKTvYcF02lzRNN+LiMGraNHp4DuuIaWeUPgk3DPQOY gT+Q== X-Gm-Message-State: AOJu0YzUkPNR6uF2ybEd4pZMl9dPMEYKe+MoUKTC8qHI3pxt3k3mcmEQ 4N8A6626FYPsTNcJW96MLZHCdluHVEwNA8ycS0jK4g2KDNMAo2vi3KQ2bwpTCOD7dtAEX+Nakgo = X-Google-Smtp-Source: AGHT+IEt371lOren32fQ56QolSAPCkFDWDj3ynX7OuagInCqyi6HdndhV0agOInpexjp850p/Kt8ew== X-Received: by 2002:a05:600c:35cf:b0:422:1def:e1ac with SMTP id 5b1f17b1804b1-422b89b1573mr24903155e9.20.1718285644788; Thu, 13 Jun 2024 06:34:04 -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 5b1f17b1804b1-422870e9145sm62391955e9.22.2024.06.13.06.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jun 2024 06:34:04 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Viljar Indus Subject: [COMMITTED 19/30] ada: Convert an info message to a continuation Date: Thu, 13 Jun 2024 15:33:25 +0200 Message-ID: <20240613133338.1809385-19-poulhies@adacore.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613133338.1809385-1-poulhies@adacore.com> References: <20240613133338.1809385-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.7 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,T_SCC_BODY_TEXT_LINE 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: Viljar Indus The info message about the freeze point should be considered a continuation of the error message about the change of visibility after the freeze point. This improves the error layout for formatted error messages with the -gnatdF switch. gcc/ada/ * sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): change the info message to a continuation message. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch13.adb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 32b3333c157..e585336ab0e 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -11150,9 +11150,10 @@ package body Sem_Ch13 is Error_Msg_NE ("!visibility of aspect for& changes after freeze point", ASN, Ent); + Error_Msg_Sloc := Sloc (Freeze_Node (Ent)); Error_Msg_NE - ("info: & is frozen here, (RM 13.1.1 (13/3))??", - Freeze_Node (Ent), Ent); + ("\& is frozen #, (RM 13.1.1 (13/3))", + ASN, Ent); end if; end Check_Aspect_At_End_Of_Declarations; -- 2.45.1