public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-7854] ada: Fix error and crash on imported function with precondition and 'Base
@ 2023-09-27  8:24 Eric Botcazou
  0 siblings, 0 replies; only message in thread
From: Eric Botcazou @ 2023-09-27  8:24 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:3959b731971ef57c3e27855e54bddefa2fa5d9d5

commit r13-7854-g3959b731971ef57c3e27855e54bddefa2fa5d9d5
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Wed Feb 1 12:35:08 2023 +0100

    ada: Fix error and crash on imported function with precondition and 'Base
    
    This fixes a spurious error on an imported function with a precondition
    and a parameter declared with a 'Base formal type, and even a crash in
    the case where this function is declared in a generic package.
    
    gcc/ada/
    
            * freeze.adb (Wrap_Imported_Subprogram): Use Copy_Subprogram_Spec
            to copy the spec from the subprogram to the generated subprogram
            body.
            (Freeze_Entity): Do not wrap imported subprograms inside generics.

Diff:
---
 gcc/ada/freeze.adb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index f54ae0503a1..df3b5ec944e 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -6127,8 +6127,7 @@ package body Freeze is
 
             Bod :=
               Make_Subprogram_Body (Loc,
-                Specification              =>
-                  Copy_Separate_Tree (Spec),
+                Specification              => Copy_Subprogram_Spec (Spec),
                 Declarations               => New_List (
                   Make_Subprogram_Declaration (Loc,
                     Specification => Copy_Separate_Tree (Spec)),
@@ -6438,7 +6437,9 @@ package body Freeze is
 
             --  Check for needing to wrap imported subprogram
 
-            Wrap_Imported_Subprogram (E);
+            if not Inside_A_Generic then
+               Wrap_Imported_Subprogram (E);
+            end if;
 
             --  Freeze all parameter types and the return type (RM 13.14(14)).
             --  However skip this for internal subprograms. This is also where

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-09-27  8:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-27  8:24 [gcc r13-7854] ada: Fix error and crash on imported function with precondition and 'Base Eric Botcazou

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).