aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2022-09-07 17:24:40 +0200
committerMarc Poulhiès <poulhies@adacore.com>2022-11-07 09:36:32 +0100
commit72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1 (patch)
tree535590f474425e791455c4f7e515f9c66c8dcc5d /gcc
parentdcc02d3168b4457746f6ab1d8e73cf9d15c6d4e8 (diff)
downloadgcc-72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1.zip
gcc-72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1.tar.gz
gcc-72ae51d581dc8bcf8dcec9b5e0e1560d9e4099d1.tar.bz2
ada: Cleanup detection of code within generic instances
To check if a node is located in a generic instance we can either look at Instantiation_Location or at the Instantiation_Depth, but just looking at the location is simpler and more efficient. Cleanup related to improved detection of references to uninitialized objects; semantics is unaffected. gcc/ada/ * sem_ch13.adb (Add_Call): Just look at Instantiation_Depth. * sem_ch3.adb (Derive_Subprograms): Likewise. * sem_warn.adb (Check_References): Remove redundant filtering with Instantiation_Depth that follows filtering with Instantiation_Location. * sinput.adb (Instantiation_Depth): Reuse Instantiation_Location.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/sem_ch13.adb2
-rw-r--r--gcc/ada/sem_ch3.adb6
-rw-r--r--gcc/ada/sem_warn.adb1
-rw-r--r--gcc/ada/sinput.adb4
4 files changed, 5 insertions, 8 deletions
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 2eb1a69..5507353 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -9930,7 +9930,7 @@ package body Sem_Ch13 is
if Opt.List_Inherited_Aspects
and then not Is_Generic_Actual_Type (Typ)
- and then Instantiation_Depth (Sloc (Typ)) = 0
+ and then Instantiation_Location (Sloc (Typ)) = No_Location
and then not Is_Internal_Name (Chars (T))
and then not Is_Internal_Name (Chars (Typ))
then
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 90af320..76dc632 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -16720,9 +16720,9 @@ package body Sem_Ch3 is
(Is_Generic_Unit
(Scope (Find_Dispatching_Type (Alias_Subp)))
or else
- Instantiation_Depth
- (Sloc (Find_Dispatching_Type (Alias_Subp))) > 0);
-
+ Instantiation_Location
+ (Sloc (Find_Dispatching_Type (Alias_Subp)))
+ /= No_Location);
declare
Iface_Prim_Loc : constant Source_Ptr :=
Original_Location (Sloc (Alias_Subp));
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index 1bfa844..a1a59a8 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -1720,7 +1720,6 @@ package body Sem_Warn is
elsif Is_Generic_Subprogram (E1)
and then not Is_Instantiated (E1)
and then not Publicly_Referenceable (E1)
- and then Instantiation_Depth (Sloc (E1)) = 0
and then Warn_On_Redundant_Constructs
then
if not Warnings_Off_E1 and then not Has_Junk_Name (E1) then
diff --git a/gcc/ada/sinput.adb b/gcc/ada/sinput.adb
index 8e80213..c96049b 100644
--- a/gcc/ada/sinput.adb
+++ b/gcc/ada/sinput.adb
@@ -620,7 +620,6 @@ package body Sinput is
-------------------------
function Instantiation_Depth (S : Source_Ptr) return Nat is
- Sind : Source_File_Index;
Sval : Source_Ptr;
Depth : Nat;
@@ -629,8 +628,7 @@ package body Sinput is
Depth := 0;
loop
- Sind := Get_Source_File_Index (Sval);
- Sval := Instantiation (Sind);
+ Sval := Instantiation_Location (Sval);
exit when Sval = No_Location;
Depth := Depth + 1;
end loop;