diff options
| author | Ghjuvan Lacambre <lacambre@adacore.com> | 2022-11-18 16:05:12 +0100 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2022-11-22 13:34:51 +0100 |
| commit | 05894d1c5c136fe3f8a36cc33cc750c3f5fb6283 (patch) | |
| tree | afdad51d38f35504ffa2ce82d52e0380bfe8c4e6 | |
| parent | 29b7e00589f1c1c00029928ac1b7ba8ff53288f5 (diff) | |
| download | gcc-05894d1c5c136fe3f8a36cc33cc750c3f5fb6283.zip gcc-05894d1c5c136fe3f8a36cc33cc750c3f5fb6283.tar.gz gcc-05894d1c5c136fe3f8a36cc33cc750c3f5fb6283.tar.bz2 | |
ada: Disable checking of Elab_Spec procedures in CodePeer_Mode
This commit re-enables the Validate_Subprogram_Calls check that had been
disabled in a previous commit and has said check skip over Elab_Spec
procedures in CodePeer_Mode.
gcc/ada/
* frontend.adb (Frontend): Re-enable Validate_Subprogram_Calls.
* exp_ch6.adb (Check_BIP_Actuals): When in CodePeer mode, do not
attempt to validate procedures coming from an
Elab_Spec/Elab_Body/Elab_Subp_Body procedure.
| -rw-r--r-- | gcc/ada/exp_ch6.adb | 17 | ||||
| -rw-r--r-- | gcc/ada/frontend.adb | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index a5dee38..237a19d 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -1115,6 +1115,23 @@ package body Exp_Ch6 is | N_Function_Call | N_Procedure_Call_Statement); + -- In CodePeer_Mode, the tree for `'Elab_Spec` procedures will be + -- malformed because GNAT does not perform the usual expansion that + -- results in the importation of external elaboration procedure symbols. + -- This is expected: the CodePeer backend has special handling for this + -- malformed tree. + -- Thus, we do not need to check the tree (and in fact can't, because + -- it's malformed). + + if CodePeer_Mode + and then Nkind (Name (Subp_Call)) = N_Attribute_Reference + and then Attribute_Name (Name (Subp_Call)) in Name_Elab_Spec + | Name_Elab_Body + | Name_Elab_Subp_Body + then + return True; + end if; + Formal := First_Formal_With_Extras (Subp_Id); Actual := First_Actual (Subp_Call); diff --git a/gcc/ada/frontend.adb b/gcc/ada/frontend.adb index bc3da30..033ecf3 100644 --- a/gcc/ada/frontend.adb +++ b/gcc/ada/frontend.adb @@ -531,7 +531,7 @@ begin -- formals). It is invoked using pragma Debug to avoid adding any cost -- when the compiler is built with assertions disabled. - if not Debug_Flag_Underscore_XX and then not CodePeer_Mode then + if not Debug_Flag_Underscore_XX then pragma Debug (Exp_Ch6.Validate_Subprogram_Calls (Cunit (Main_Unit))); end if; |