aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@nrc-cnrc.gc.ca>2005-03-19 16:45:59 +0000
committerJohn David Anglin <danglin@gcc.gnu.org>2005-03-19 16:45:59 +0000
commit6c6d9d33ef1cfdc73d836b4acb70210a824b035a (patch)
treef725ea41922a90374491a58c72f4c03b4c46444c
parent1ad93fbfe98afdcb5be95b81afd6e788c22975d2 (diff)
downloadgcc-6c6d9d33ef1cfdc73d836b4acb70210a824b035a.zip
gcc-6c6d9d33ef1cfdc73d836b4acb70210a824b035a.tar.gz
gcc-6c6d9d33ef1cfdc73d836b4acb70210a824b035a.tar.bz2
re PR middle-end/20493 (Bootstrap failure because of aliased symbols)
PR middle-end/20493 * fold-const.c (fold_widened_comparison): Don't optimize casts of function pointers on targets that require function pointer canonicalization. (fold_sign_changed_comparison): Likewise. From-SVN: r96733
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/fold-const.c18
2 files changed, 26 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c55ed73..f40720a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-19 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
+
+ PR middle-end/20493
+ * fold-const.c (fold_widened_comparison): Don't optimize casts of
+ function pointers on targets that require function pointer
+ canonicalization.
+ (fold_sign_changed_comparison): Likewise.
+
2005-03-19 Bernd Schmidt <bernd.schmidt@analog.com>
* combine.c (try_combine): When changing the mode of a hard reg, make
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 13e9153..bc17c1d 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -6074,6 +6074,15 @@ fold_widened_comparison (enum tree_code code, tree type, tree arg0, tree arg1)
return NULL_TREE;
shorter_type = TREE_TYPE (arg0_unw);
+#ifdef HAVE_canonicalize_funcptr_for_compare
+ /* Disable this optimization if we're casting a function pointer
+ type on targets that require function pointer canonicalization. */
+ if (HAVE_canonicalize_funcptr_for_compare
+ && TREE_CODE (shorter_type) == POINTER_TYPE
+ && TREE_CODE (TREE_TYPE (shorter_type)) == FUNCTION_TYPE)
+ return NULL_TREE;
+#endif
+
if (TYPE_PRECISION (TREE_TYPE (arg0)) <= TYPE_PRECISION (shorter_type))
return NULL_TREE;
@@ -6156,6 +6165,15 @@ fold_sign_changed_comparison (enum tree_code code, tree type,
arg0_inner = TREE_OPERAND (arg0, 0);
inner_type = TREE_TYPE (arg0_inner);
+#ifdef HAVE_canonicalize_funcptr_for_compare
+ /* Disable this optimization if we're casting a function pointer
+ type on targets that require function pointer canonicalization. */
+ if (HAVE_canonicalize_funcptr_for_compare
+ && TREE_CODE (inner_type) == POINTER_TYPE
+ && TREE_CODE (TREE_TYPE (inner_type)) == FUNCTION_TYPE)
+ return NULL_TREE;
+#endif
+
if (TYPE_PRECISION (inner_type) != TYPE_PRECISION (outer_type))
return NULL_TREE;