diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2022-02-02 21:04:18 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-05-11 08:53:21 +0000 |
| commit | c63b798f88aa82de32789b6a2ae5f387e58165c7 (patch) | |
| tree | 6da8998a70ecc6d5eb5c40066dbf7377ec620ccc | |
| parent | bd97da66c886a69c2d831dad1b3ffe06aa1879fe (diff) | |
| download | gcc-c63b798f88aa82de32789b6a2ae5f387e58165c7.zip gcc-c63b798f88aa82de32789b6a2ae5f387e58165c7.tar.gz gcc-c63b798f88aa82de32789b6a2ae5f387e58165c7.tar.bz2 | |
[Ada] Fix spurious ambiguity for if_expression containing operator
It comes from a discrepancy in the analysis of binary operators, between
the predefined ones for which we register an interpretation with the base
type and the user-defined ones for which we register an interpretation
with the subtype directly.
This is harmless in almost all cases because the two interpretations do not
differ by this type property only, but is problematic when the operation is
the dependent expression of a conditional expression, because it causes two
interpretations of the conditional expression to be registered, which this
time differ by this type property only, thus making them impossible to be
disambiguated later.
gcc/ada/
* sem_ch4.adb (Analyze_User_Defined_Binary_Op): Use the base type
in the interpretation of the operator.
| -rw-r--r-- | gcc/ada/sem_ch4.adb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index c913e8b..ca8e1cd 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -5934,7 +5934,7 @@ package body Sem_Ch4 is and then (Has_Compatible_Type (Right_Opnd (N), Etype (F2)) or else Etype (F2) = Any_Type) then - Add_One_Interp (N, Op_Id, Etype (Op_Id)); + Add_One_Interp (N, Op_Id, Base_Type (Etype (Op_Id))); -- If the operands are overloaded, indicate that the current -- type is a viable candidate. This is redundant in most cases, |