]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fix internal error on anonymous access type equality
authorEric Botcazou <ebotcazou@adacore.com>
Tue, 9 Jan 2024 09:21:51 +0000 (10:21 +0100)
committerEric Botcazou <ebotcazou@adacore.com>
Tue, 9 Jan 2024 09:24:57 +0000 (10:24 +0100)
This is a small regression present on the mainline and 13 branch, in the
form of an internal error in gigi on anonymous access type equality.  We
now need to also accept them for anonymous access types that point to
compatible object subtypes in the language sense.

gcc/ada/
* gcc-interface/utils2.cc (build_binary_op) <EQ_EXPR>: Relax
assertion for regular pointer types.

gcc/testsuite/
* gnat.dg/specs/anon4.ads: New test.

gcc/ada/gcc-interface/utils2.cc
gcc/testsuite/gnat.dg/specs/anon4.ads [new file with mode: 0644]

index 6a951093ff8f489a96a059c2728452a7c544f5b9..df11eef21017204ce2fe315521b269156303f87e 100644 (file)
@@ -1142,14 +1142,10 @@ build_binary_op (enum tree_code op_code, tree result_type,
              tree left_ref_type = TREE_TYPE (left_base_type);
              tree right_ref_type = TREE_TYPE (right_base_type);
 
-             /* Anonymous access types in Ada 2005 can point to different
-                members of a tagged hierarchy or different function types.  */
-             gcc_assert (TYPE_MAIN_VARIANT (left_ref_type)
-                         == TYPE_MAIN_VARIANT (right_ref_type)
-                         || (TYPE_ALIGN_OK (left_ref_type)
-                             && TYPE_ALIGN_OK (right_ref_type))
-                         || (TREE_CODE (left_ref_type) == FUNCTION_TYPE
-                             && TREE_CODE (right_ref_type) == FUNCTION_TYPE));
+             /* Anonymous access types in Ada 2005 may point to compatible
+                object subtypes or function types in the language sense.  */
+             gcc_assert (FUNCTION_POINTER_TYPE_P (left_ref_type)
+                         == FUNCTION_POINTER_TYPE_P (right_ref_type));
              best_type = left_base_type;
            }
 
diff --git a/gcc/testsuite/gnat.dg/specs/anon4.ads b/gcc/testsuite/gnat.dg/specs/anon4.ads
new file mode 100644 (file)
index 0000000..493cf60
--- /dev/null
@@ -0,0 +1,10 @@
+-- { dg-do compile }
+
+package Anon4 is
+   subtype I is Integer;
+   A : access I;
+
+   Acc : access Integer;
+
+   function F return Boolean is (A = Acc);
+end Anon4;