[gcc r14-4025] ada: Fix internal error on expression function with Refined_Post aspect

Marc Poulhi?s dkm@gcc.gnu.org
Fri Sep 15 13:04:39 GMT 2023


https://gcc.gnu.org/g:ef49cc3890587bcb7ce50801d10c9658a59479dd

commit r14-4025-gef49cc3890587bcb7ce50801d10c9658a59479dd
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Tue Sep 5 13:21:24 2023 +0200

    ada: Fix internal error on expression function with Refined_Post aspect
    
    This occurs when the expression function calls a protected function and the
    -gnata switch is specified, because the compiler wrongly freezes the called
    function when analyzing the expression function, a fallout of the wrapping
    scheme used for the Post and Refined_Post aspects.
    
    gcc/ada/
    
            * sem_res.adb (Resolve_Call): When the target is an entity, do not
            freeze it if the current scope is the inner wrapper function built
            for an expression function with a Post or Refined_Post aspect.

Diff:
---
 gcc/ada/sem_res.adb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index c708d04fc32..b8d8e701ae3 100644
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -6582,6 +6582,9 @@ package body Sem_Res is
       if Is_Entity_Name (Subp)
         and then not In_Spec_Expression
         and then not Is_Expression_Function_Or_Completion (Current_Scope)
+        and then not (Chars (Current_Scope) = Name_uWrapped_Statements
+                       and then Is_Expression_Function_Or_Completion
+                                  (Scope (Current_Scope)))
         and then
           (not Is_Expression_Function_Or_Completion (Entity (Subp))
             or else Expander_Active)


More information about the Gcc-cvs mailing list