From 0adef32bee4f98513acb41813bba4f70bda7a050 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 13 Oct 2008 21:10:32 +0200 Subject: [PATCH] re PR middle-end/37601 (gcc-4.4-20080919 ada build failure) PR middle-end/37601 * gcc-interface/utils.c (gnat_types_compatible_p): Handle NULL TYPE_DOMAIN. From-SVN: r141092 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/utils.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d384ff5..7cbfc1b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2008-10-13 Jakub Jelinek + + PR middle-end/37601 + * gcc-interface/utils.c (gnat_types_compatible_p): Handle + NULL TYPE_DOMAIN. + 2008-10-07 Eric Botcazou * gcc-interface/decl.c (gnat_to_gnu_entity) : Move code diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index d883d53..21904d4 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -2444,10 +2444,13 @@ gnat_types_compatible_p (tree t1, tree t2) the same component type and the same domain. */ if (code == ARRAY_TYPE && TREE_TYPE (t1) == TREE_TYPE (t2) - && tree_int_cst_equal (TYPE_MIN_VALUE (TYPE_DOMAIN (t1)), - TYPE_MIN_VALUE (TYPE_DOMAIN (t2))) - && tree_int_cst_equal (TYPE_MAX_VALUE (TYPE_DOMAIN (t1)), - TYPE_MAX_VALUE (TYPE_DOMAIN (t2)))) + && (TYPE_DOMAIN (t1) == TYPE_DOMAIN (t2) + || (TYPE_DOMAIN (t1) + && TYPE_DOMAIN (t2) + && tree_int_cst_equal (TYPE_MIN_VALUE (TYPE_DOMAIN (t1)), + TYPE_MIN_VALUE (TYPE_DOMAIN (t2))) + && tree_int_cst_equal (TYPE_MAX_VALUE (TYPE_DOMAIN (t1)), + TYPE_MAX_VALUE (TYPE_DOMAIN (t2)))))) return 1; /* Padding record types are also compatible if they pad the same -- 2.7.4