diff options
| author | Javier Miranda <miranda@adacore.com> | 2019-07-04 08:07:24 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-07-04 08:07:24 +0000 |
| commit | 07c91770f821ae9f6a567fb79b7f2ed675dfeaff (patch) | |
| tree | 2197c7386bf341a7fae35a274dc1ff78ba5aa6bf /gcc/ada/exp_tss.adb | |
| parent | 7cbe60de258f6d09561d4fe32dac8892b52520fe (diff) | |
| download | gcc-07c91770f821ae9f6a567fb79b7f2ed675dfeaff.zip gcc-07c91770f821ae9f6a567fb79b7f2ed675dfeaff.tar.gz gcc-07c91770f821ae9f6a567fb79b7f2ed675dfeaff.tar.bz2 | |
[Ada] Spurious error on non-default C++ constructor
The frontend reports spurious errors on C++ non-default constructors
that have formals whose type is an access to subprogram.
2019-07-04 Javier Miranda <miranda@adacore.com>
gcc/ada/
* exp_tss.adb (Init_Proc): Adding missing support for access to
subprograms and access to protected subprograms of non-default
C++ constructors.
gcc/testsuite/
* gnat.dg/cpp_constructor.adb, gnat.dg/cpp_constructor_fp.ads,
gnat.dg/cpp_constructor_useit.ads: New testcase.
From-SVN: r273072
Diffstat (limited to 'gcc/ada/exp_tss.adb')
| -rw-r--r-- | gcc/ada/exp_tss.adb | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ada/exp_tss.adb b/gcc/ada/exp_tss.adb index 388be48..8ef05e2 100644 --- a/gcc/ada/exp_tss.adb +++ b/gcc/ada/exp_tss.adb @@ -32,6 +32,7 @@ with Lib; use Lib; with Restrict; use Restrict; with Rident; use Rident; with Sem_Aux; use Sem_Aux; +with Sem_Ch6; use Sem_Ch6; with Sem_Util; use Sem_Util; with Sinfo; use Sinfo; @@ -275,8 +276,8 @@ package body Exp_Tss is then exit; - elsif Ekind (Etype (E1)) /= E_Anonymous_Access_Type - and then Ekind (Etype (E2)) /= E_Anonymous_Access_Type + elsif not Is_Anonymous_Access_Type (Etype (E1)) + and then not Is_Anonymous_Access_Type (Etype (E2)) and then Etype (E1) /= Etype (E2) then exit; @@ -287,6 +288,17 @@ package body Exp_Tss is /= Directly_Designated_Type (Etype (E2)) then exit; + + elsif Ekind_In (Etype (E1), + E_Anonymous_Access_Subprogram_Type, + E_Anonymous_Access_Protected_Subprogram_Type) + and then Ekind_In (Etype (E2), + E_Anonymous_Access_Subprogram_Type, + E_Anonymous_Access_Protected_Subprogram_Type) + and then not Conforming_Types + (Etype (E1), Etype (E2), Fully_Conformant) + then + exit; end if; E1 := Next_Formal (E1); |