aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorSteve Baird <baird@adacore.com>2022-08-29 13:26:30 -0700
committerMarc Poulhiès <poulhies@adacore.com>2022-09-12 10:16:50 +0200
commit1588e8872ac0eb0d34a35b2f4dc9539ce10f4746 (patch)
tree4f58a0d3026e61638a16793f1365a80809729108 /gcc/ada
parent4a46f59cb360013e11591a1e0d4cdc09f4b7dee1 (diff)
downloadgcc-1588e8872ac0eb0d34a35b2f4dc9539ce10f4746.zip
gcc-1588e8872ac0eb0d34a35b2f4dc9539ce10f4746.tar.gz
gcc-1588e8872ac0eb0d34a35b2f4dc9539ce10f4746.tar.bz2
[Ada] bugbox referencing INOX prefixed view of primitive op of modular type
The -gnatX switch enables naming a prefixed view of a subprogram with an untagged prefix. Compiling such a reference where the prefix is of a modular type could result in an internal compiler error. gcc/ada/ * sem_ch4.adb (Analyze_Selected_Component): Avoid initializing the local variable Comp if the variable is not going to be subsequently referenced. This is a correctness issue because the call to First_Entity can fail.
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/sem_ch4.adb11
1 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index b63b5c8..6c81732 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -5187,7 +5187,16 @@ package body Sem_Ch4 is
and then not Is_Derived_Type (Prefix_Type)
and then Is_Entity_Name (Name);
- Comp := First_Entity (Type_To_Use);
+ -- Avoid initializing Comp if that initialization is not needed
+ -- (and, more importantly, if the call to First_Entity could fail).
+
+ if Has_Discriminants (Type_To_Use)
+ or else Is_Record_Type (Type_To_Use)
+ or else Is_Private_Type (Type_To_Use)
+ or else Is_Concurrent_Type (Type_To_Use)
+ then
+ Comp := First_Entity (Type_To_Use);
+ end if;
-- If the selector has an original discriminant, the node appears in
-- an instance. Replace the discriminant with the corresponding one