[gcc r11-4304] [Ada] Crash on expression function and access type

Pierre-Marie de Rodat pmderodat@gcc.gnu.org
Fri Oct 23 08:28:17 GMT 2020


https://gcc.gnu.org/g:995e0727ce999d3f4d5976e98ce31c70cb0469ed

commit r11-4304-g995e0727ce999d3f4d5976e98ce31c70cb0469ed
Author: Ed Schonberg <schonberg@adacore.com>
Date:   Thu Sep 3 09:54:40 2020 -0400

    [Ada] Crash on expression function and access type
    
    gcc/ada/
    
            * freeze.adb (Freeze_Type_Refs): Add guard on freezing of the
            designated type of an access type appearing in the expression,
            when expression includes an explicit dereference whose prefix
            includes a function call.

Diff:
---
 gcc/ada/freeze.adb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index b95a216ef9b..2118307406d 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -8008,19 +8008,19 @@ package body Freeze is
          if Nkind (Node) in N_Has_Etype
            and then Present (Etype (Node))
            and then Is_Access_Type (Etype (Node))
-           and then Nkind (Parent (Node)) = N_Function_Call
-           and then Node = Controlling_Argument (Parent (Node))
          then
-            Check_And_Freeze_Type (Designated_Type (Etype (Node)));
+            if Nkind (Parent (Node)) = N_Function_Call
+              and then Node = Controlling_Argument (Parent (Node))
+            then
+               Check_And_Freeze_Type (Designated_Type (Etype (Node)));
 
-         --  An explicit dereference freezes the designated type as well,
-         --  even though that type is not attached to an entity in the
-         --  expression.
+            --  An explicit dereference freezes the designated type as well,
+            --  even though that type is not attached to an entity in the
+            --  expression.
 
-         elsif Nkind (Node) in N_Has_Etype
-           and then Nkind (Parent (Node)) = N_Explicit_Dereference
-         then
-            Check_And_Freeze_Type (Designated_Type (Etype (Node)));
+            elsif Nkind (Parent (Node)) = N_Explicit_Dereference then
+               Check_And_Freeze_Type (Designated_Type (Etype (Node)));
+            end if;
 
          --  An iterator specification freezes the iterator type, even though
          --  that type is not attached to an entity in the construct.


More information about the Gcc-cvs mailing list