aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2015-05-23 15:51:26 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2015-05-23 13:51:26 +0000
commit14e40d7efcebb33770d6f51d51f5df6eb1ac69cc (patch)
tree620f2dd6e2afbfbba1022402fa0e0ab0642e7711
parente2897e23a7574e634907e16e726add570d9e6d2d (diff)
downloadgcc-14e40d7efcebb33770d6f51d51f5df6eb1ac69cc.zip
gcc-14e40d7efcebb33770d6f51d51f5df6eb1ac69cc.tar.gz
gcc-14e40d7efcebb33770d6f51d51f5df6eb1ac69cc.tar.bz2
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
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree.c10
2 files changed, 9 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41dde61..82f635d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-22 Jan Hubicka <hubicka@ucw.cz>
+
+ * 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 <jim.wilson@linaro.org>
* Makefile.in (check_gcc_parallelize): Delete.
diff --git a/gcc/tree.c b/gcc/tree.c
index 0ab965f..accab4d 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