From 14e40d7efcebb33770d6f51d51f5df6eb1ac69cc Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sat, 23 May 2015 15:51:26 +0200 Subject: [PATCH] tree.c (gimple_canonical_types_compatible_p): Do not compare function attributes. * tree.c (gimple_canonical_types_compatible_p): Do not compare function attributes. (verify_type): Remove METHOD_TYPE FIXME; update FUNCTION_TYPE. From-SVN: r223606 --- gcc/ChangeLog | 6 ++++++ gcc/tree.c | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 41dde617c4c..82f635d5f0c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-05-22 Jan Hubicka + + * tree.c (gimple_canonical_types_compatible_p): Do not compare + function attributes. + (verify_type): Remove METHOD_TYPE FIXME; update FUNCTION_TYPE. + 2015-05-22 Jim Wilson * Makefile.in (check_gcc_parallelize): Delete. diff --git a/gcc/tree.c b/gcc/tree.c index 0ab965f3c94..accab4dd554 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -12837,9 +12837,6 @@ gimple_canonical_types_compatible_p (const_tree t1, const_tree t2, trust_type_canonical)) return false; - if (!comp_type_attributes (t1, t2)) - return false; - if (TYPE_ARG_TYPES (t1) == TYPE_ARG_TYPES (t2)) return true; else @@ -12939,10 +12936,9 @@ verify_type (const_tree t) /* Method and function types can not be used to address memory and thus TYPE_CANONICAL really matters only for determining useless conversions. - FIXME: C++ FE does not agree with gimple_canonical_types_compatible_p - here. gimple_canonical_types_compatible_p calls comp_type_attributes - while for C++ FE the attributes does not make difference. */ - else if (TREE_CODE (t) == FUNCTION_TYPE || TREE_CODE (t) == METHOD_TYPE) + FIXME: C++ FE produce declarations of builtin functions that are not + compatible with main variants. */ + else if (TREE_CODE (t) == FUNCTION_TYPE) ; else if (t != ct /* FIXME: gimple_canonical_types_compatible_p can not compare types -- 2.30.2