Message ID | 20240516092606.41242-12-poulhies@adacore.com |
---|---|
State | New |
Headers | show
Return-Path: <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org> 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=ACox60F5; 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 4Vg4b36rFXz20KF for <incoming@patchwork.ozlabs.org>; Thu, 16 May 2024 19:30:55 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 74C0E3849AF7 for <incoming@patchwork.ozlabs.org>; Thu, 16 May 2024 09:30:53 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by sourceware.org (Postfix) with ESMTPS id 92D9B3849AFF for <gcc-patches@gcc.gnu.org>; Thu, 16 May 2024 09:26:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 92D9B3849AFF 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 92D9B3849AFF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::230 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715851585; cv=none; b=ZKZjz9+2FbUZBeeHKmdFo2rIgPkLDwDWslSljlhHfT0K7xhiezDFMgrPqpom5Zs4POZWjnHMcIArK9jEd5UQaMYDUztCVAygoq6q8qY/IWfrNc+hd4/It50zBvnkGBmE2TBpuBVnqOwZPdkFgME6Usw3V/u13DemXsKJ6EUpRL4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715851585; c=relaxed/simple; bh=FpZ91xtek7hzrizWeMx+J1Q2mvMDsYJokuVLumo6p2k=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=SydMJqxa68aDVvjK9XTmmMO1Fq9zZ11KvFa+P4hf+1hru/BaFsE/R+2m74lq93p6fCG4pRXuYW5QuFsUrNOu6GEzb/udb+X82JQlKvppyDeCUP4oHdXZKRU9Ja39Hm1z9dBff0H48+/CP+Duf6kyonPRvGUhVGHYfGDnYrqXW5M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2e428242a38so6292241fa.2 for <gcc-patches@gcc.gnu.org>; Thu, 16 May 2024 02:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715851578; x=1716456378; 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=pYOUeXssBL+YTgqasBn4oT+TqWBWfulxCXNoa7ZEsjA=; b=ACox60F5XwpJXJoqY77BeGkDw4rINpCtL/+GrhMkgAm6aLBOUS+QmUV72SeaXoZzN+ NpbVi7t29HgYtvXJpKa3Rgn3NPqZuSotrq69snuklWm+kzWjB7CUOoMvZmnWBl1XPz1e jTujfUD9hOR1CVROoCaBnWzgs6u6yWVXZ6K0VYRJA9FMzKl5KoLp3ALJisiT5N1ZsAYp THgndJtij0vfadAiY33Z5+Pyf92ftUaNHlcTmfc5/bH1euKtvuCu75xOfzzfyHWs3lnj 8foSVZ5MsCzCZrcD/DGfHJBb0EmOvN/glNRxebpUR1DRFvVgERSkk/sslSwE86+Zz5hL akkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715851578; x=1716456378; 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=pYOUeXssBL+YTgqasBn4oT+TqWBWfulxCXNoa7ZEsjA=; b=q0YnREJsElpaip4Owz+1uIrVKbFtHPST0YG3GyH1gO5fbDCmYORLIxRbITkP2B1AAq +CwxDji6T+3QmmcTiOgjduLJqEvCeKcnUj755Qt1TUmfxLHE8USnCsthozArO3BH/zZl csC6BSGJ/EpkhCAElTsRkPiwN4WBm/z+2nmELxfNhUdGOrGEN+FvgHQI7ZAF9HMgMXxV mNVWRcIF1RnaDXf9v4fCn/3zZy7ji4BmFyzMn/n7tG357VcknpnnuAOqMubSwEnli+th NBs/WCE5Q5FiPZ+4WMHRFsXAf4Q5tNRJ3cYITSumXc093XYnQz2BE2QsLIXUqUUY3fu4 4rxg== X-Gm-Message-State: AOJu0Yx2eXGCehaXrl6qNwem7lwmxSwqRxDX1ahuCHWIK8RZnpuOJLZF xxT2+C200asqLwJ64hrw5K9BLrI3//nX+APKBA3PKr7HGRny6rUmCT64FTCZUzYkWEVt3YZbnEQ = X-Google-Smtp-Source: AGHT+IGvrzItYXihPk3fwH/T62jJCSmV/kYyZpK6DXbEGMgbuD93d3BhqVFWrxH16OK/5Qv/Wb2Fow== X-Received: by 2002:a05:651c:23a:b0:2e1:a747:532d with SMTP id 38308e7fff4ca-2e51fc36328mr164210871fa.8.1715851578167; Thu, 16 May 2024 02:26:18 -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-41fd10cf8besm135802635e9.1.2024.05.16.02.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 02:26:17 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= <poulhies@adacore.com> To: gcc-patches@gcc.gnu.org Cc: Ronan Desplanques <desplanques@adacore.com> Subject: [COMMITTED 12/35] ada: Fix crash with -gnatdJ and -gnatw_q Date: Thu, 16 May 2024 11:25:41 +0200 Message-ID: <20240516092606.41242-12-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240516092606.41242-1-poulhies@adacore.com> References: <20240516092606.41242-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, WEIRD_QUOTING 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 <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org |
Series |
[COMMITTED,01/35] ada: Fix docs and comments about pragmas for Boolean-valued aspects
|
expand
|
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 762e75616a7..7a2003691ec 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -2340,12 +2340,12 @@ package body Exp_Ch4 is pragma Assert (Is_First_Subtype (Outer_Type) or else Is_Generic_Actual_Type (Outer_Type)); - Error_Msg_Node_1 := Outer_Type; Error_Msg_Node_2 := Comp_Type; - Error_Msg - ("?_q?""="" for type & uses predefined ""="" for }", Loc); + Error_Msg_N + ("?_q?""="" for type & uses predefined ""="" for }", + Outer_Type); Error_Msg_Sloc := Sloc (Op); - Error_Msg ("\?_q?""="" # is ignored here", Loc); + Error_Msg_N ("\?_q?""="" # is ignored here", Outer_Type); end if; end;
From: Ronan Desplanques <desplanques@adacore.com> This commit makes the emission of -gnatw_q warnings pass node information so as to handle the enclosing subprogram display of -gnatdJ instead of crashing. gcc/ada/ * exp_ch4.adb (Expand_Composite_Equality): Call Error_Msg_N instead of Error_Msg. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_ch4.adb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)