aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2022-12-20 16:27:30 +0100
committerMarc Poulhiès <poulhies@adacore.com>2023-01-05 15:30:02 +0100
commit6147feb54c7473033c5e9344fdd834c417820af4 (patch)
tree9b8dc6d6646647c488142b195ca03cf8db3ebc42 /gcc
parent07facb98ed0db8771fd36e6c73921177c11b18ea (diff)
downloadgcc-6147feb54c7473033c5e9344fdd834c417820af4.zip
gcc-6147feb54c7473033c5e9344fdd834c417820af4.tar.gz
gcc-6147feb54c7473033c5e9344fdd834c417820af4.tar.bz2
ada: Remove unhelpful special case for renamed bodies in GNATprove mode
This patch reverts a special-case related to inlining of renamed bodies in GNATprove mode. Its idea was that inlining is decided in routine Cannot_Inline, which is called much later. This didn't quite work, because in the meantime the renamed body was prepared to inlining in Build_Body_To_Inline, which was not designed to handle renamed bodies. gcc/ada/ * freeze.adb (Build_Renamed_Body): Revert a special case for GNATprove; remove unnecessary initialization of a local variable.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/freeze.adb7
1 files changed, 2 insertions, 5 deletions
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 97a25d1..a3ab685 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -398,7 +398,7 @@ package body Freeze is
Nam : constant Node_Id := Name (N);
Old_S : Entity_Id;
Spec : constant Node_Id := New_Copy_Tree (Specification (Decl));
- Actuals : List_Id := No_List;
+ Actuals : List_Id;
Call_Node : Node_Id;
Call_Name : Node_Id;
Body_Node : Node_Id;
@@ -477,14 +477,11 @@ package body Freeze is
-- calls to the renamed entity. The body must be generated in any case
-- for calls that may appear elsewhere. This is not done in the case
-- where the subprogram is an instantiation because the actual proper
- -- body has not been built yet. This is also not done in GNATprove mode
- -- as we need to check other conditions for creating a body to inline
- -- in that case, which are controlled in Analyze_Subprogram_Body_Helper.
+ -- body has not been built yet.
if Ekind (Old_S) in E_Function | E_Procedure
and then Nkind (Decl) = N_Subprogram_Declaration
and then not Is_Generic_Instance (Old_S)
- and then not GNATprove_Mode
then
Set_Body_To_Inline (Decl, Old_S);
end if;