FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Ada] Avoid repeated conversions from Int to Char_Code

Browse source 
When expanding aggregates like "(others => 'x')" into strings we
repeated conversion from Int to Char_Code for every character.  Now we
convert once and use the Char_Code directly.

Cleanup related to handling characters in GNATprove counterexamples;
semantics is unaffected.

gcc/ada/

	* exp_aggr.adb (Expand_N_Aggregate): Replace UI_To_Int with
	UI_To_CC; replace magic literals with high-level routines that
	recognise wide and wide wide characters; reorder if-then-elsif
	condition, because we don't have a routine to detect wide wide
	characters.
This commit is contained in:
Piotr Trojanek 2022-01-18 21:24:32 +01:00 • committed by Pierre-Marie de Rodat
parent 3ad8cac470
commit 53f2aaf0b3
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gcc/ada/exp_aggr.adb
View file

@ -7161,10 +7161,10 @@ package body Exp_Aggr is
and then No (Expressions (N))
then
declare
X : constant Node_Id := First_Index (T);
EC : constant Node_Id := Expression (CA);
CV : constant Uint := Char_Literal_Value (EC);
CC : constant Int := UI_To_Int (CV);
X : constant Node_Id := First_Index (T);
EC : constant Node_Id := Expression (CA);
CV : constant Uint := Char_Literal_Value (EC);
CC : constant Char_Code := UI_To_CC (CV);
begin
if Nkind (X) = N_Range
@ -7180,17 +7180,19 @@ package body Exp_Aggr is
Start_String;
for J in 1 .. UI_To_Int (Hi) loop
Store_String_Char (Char_Code (CC));
Store_String_Char (CC);
end loop;
Rewrite (N,
Make_String_Literal (Sloc (N),
Strval => End_String));
if CC >= Int (2 ** 16) then
Set_Has_Wide_Wide_Character (N);
elsif CC >= Int (2 ** 8) then
if In_Character_Range (CC) then
null;
elsif In_Wide_Character_Range (CC) then
Set_Has_Wide_Character (N);
else
Set_Has_Wide_Wide_Character (N);
end if;
Analyze_And_Resolve (N, T);