ada: Fix recent assertion failure on GPR2
It's the compiler trying to load the nonexistent body of a generic package
when trying to inline a call to an expression function of this package that
has a pre or post-condition (hence the need for -gnata to trigger the ICE).
gcc/ada/
* contracts.adb (Build_Subprogram_Contract_Wrapper): Do not fiddle
with the Was_Expression_Function flag. Move a few lines around.
diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb
index fef3d24..6f474eb 100644
--- a/gcc/ada/contracts.adb
+++ b/gcc/ada/contracts.adb
@@ -1691,6 +1691,10 @@
Set_Debug_Info_Needed (Wrapper_Id);
Set_Wrapped_Statements (Subp_Id, Wrapper_Id);
+ Set_Has_Pragma_Inline (Wrapper_Id, Has_Pragma_Inline (Subp_Id));
+ Set_Has_Pragma_Inline_Always
+ (Wrapper_Id, Has_Pragma_Inline_Always (Subp_Id));
+
-- Create specification and declaration for the wrapper
if No (Ret_Type) or else Ret_Type = Standard_Void_Type then
@@ -1719,20 +1723,6 @@
Make_Handled_Sequence_Of_Statements (Loc,
End_Label => Make_Identifier (Loc, Chars (Wrapper_Id))));
- -- Move certain flags which are relevant to the body
-
- -- Wouldn't a better way be to perform some sort of copy of Body_Decl
- -- for Wrapper_Body be less error-prone ???
-
- if Was_Expression_Function (Body_Decl) then
- Set_Was_Expression_Function (Body_Decl, False);
- Set_Was_Expression_Function (Wrapper_Body);
- end if;
-
- Set_Has_Pragma_Inline (Wrapper_Id, Has_Pragma_Inline (Subp_Id));
- Set_Has_Pragma_Inline_Always
- (Wrapper_Id, Has_Pragma_Inline_Always (Subp_Id));
-
-- Prepend a call to the wrapper when the subprogram is a procedure
if No (Ret_Type) or else Ret_Type = Standard_Void_Type then
