From: Pierre-Marie de Rodat <derodat@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Piotr Trojanek <trojanek@adacore.com>
Subject: [Ada] Use source casing in messages for aliasing checks
Date: Thu, 17 Jun 2021 10:33:10 -0400 [thread overview]
Message-ID: <20210617143310.GA9490@adacore.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 691 bytes --]
When compiling code with -gnateA -gnateE switches, i.e. with aliasing
checks and extra information in exception messages, the runtime error
includes names the overlapping formal parameters. Those parameters are
now printed exactly as they appear in the source code, not in casing
that has been determined for the compilation unit.
For example, error emitted for GNATprove included name "Fa" for a formal
parameter that appears in the code as "FA", because GNATprove uses mixed
case coding convention (just like GNAT).
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* checks.adb (Overlap_Check): Replace Set_Casing with
Adjust_Name_Case and adapt surrounding code as needed.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 1682 bytes --]
diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb
--- a/gcc/ada/checks.adb
+++ b/gcc/ada/checks.adb
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
with Atree; use Atree;
-with Casing; use Casing;
with Debug; use Debug;
with Einfo; use Einfo;
with Einfo.Entities; use Einfo.Entities;
@@ -2417,9 +2416,8 @@ package body Checks is
Formal_2 : Entity_Id;
Check : in out Node_Id)
is
- Cond : Node_Id;
- ID_Casing : constant Casing_Type :=
- Identifier_Casing (Source_Index (Current_Sem_Unit));
+ Cond : Node_Id;
+ Formal_Name : Bounded_String;
begin
-- Generate:
@@ -2451,15 +2449,17 @@ package body Checks is
Store_String_Chars ("aliased parameters, actuals for """);
- Get_Name_String (Chars (Formal_1));
- Set_Casing (ID_Casing);
- Store_String_Chars (Name_Buffer (1 .. Name_Len));
+ Append (Formal_Name, Chars (Formal_1));
+ Adjust_Name_Case (Formal_Name, Sloc (Formal_1));
+ Store_String_Chars (To_String (Formal_Name));
Store_String_Chars (""" and """);
- Get_Name_String (Chars (Formal_2));
- Set_Casing (ID_Casing);
- Store_String_Chars (Name_Buffer (1 .. Name_Len));
+ Formal_Name.Length := 0;
+
+ Append (Formal_Name, Chars (Formal_2));
+ Adjust_Name_Case (Formal_Name, Sloc (Formal_2));
+ Store_String_Chars (To_String (Formal_Name));
Store_String_Chars (""" overlap");
reply other threads:[~2021-06-17 14:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210617143310.GA9490@adacore.com \
--to=derodat@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=trojanek@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).