[gcc r13-484] [Ada] Fix internal error on mix of controlled and protected types

Pierre-Marie de Rodat pmderodat@gcc.gnu.org
Mon May 16 08:43:42 GMT 2022


https://gcc.gnu.org/g:146ea83af978384b0f7dabc8176f8bf98892ce2a

commit r13-484-g146ea83af978384b0f7dabc8176f8bf98892ce2a
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Thu Mar 10 11:11:32 2022 +0100

    [Ada] Fix internal error on mix of controlled and protected types
    
    The key is that the protected type is a (limited) private type, which
    fools a test in Cleanup_Scopes.
    
    gcc/ada/
    
            * inline.adb (Cleanup_Scopes): Test the underlying type.

Diff:
---
 gcc/ada/inline.adb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index 5944aed0b00..a1d22544874 100644
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -2773,7 +2773,7 @@ package body Inline is
             Scop := Protected_Body_Subprogram (Scop);
 
          elsif Is_Subprogram (Scop)
-           and then Is_Protected_Type (Scope (Scop))
+           and then Is_Protected_Type (Underlying_Type (Scope (Scop)))
            and then Present (Protected_Body_Subprogram (Scop))
          then
             --  If a protected operation contains an instance, its cleanup


More information about the Gcc-cvs mailing list