From 4d3fd59953bcf423dd0859a2c6b95b5260aed71d Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 9 Jan 2024 10:21:51 +0100 Subject: [PATCH] Fix internal error on anonymous access type equality 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) : Relax assertion for regular pointer types. gcc/testsuite/ * gnat.dg/specs/anon4.ads: New test. --- gcc/ada/gcc-interface/utils2.cc | 12 ++++-------- gcc/testsuite/gnat.dg/specs/anon4.ads | 10 ++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/specs/anon4.ads diff --git a/gcc/ada/gcc-interface/utils2.cc b/gcc/ada/gcc-interface/utils2.cc index 6a951093ff8f..df11eef21017 100644 --- a/gcc/ada/gcc-interface/utils2.cc +++ b/gcc/ada/gcc-interface/utils2.cc @@ -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 index 000000000000..493cf6093f21 --- /dev/null +++ b/gcc/testsuite/gnat.dg/specs/anon4.ads @@ -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; -- 2.47.2