aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMikael Morin <mikael@gcc.gnu.org>2010-08-23 18:42:21 +0000
committerMikael Morin <mikael@gcc.gnu.org>2010-08-23 18:42:21 +0000
commitc0d15a7748467574548cd61de68dbf9ae9215428 (patch)
tree6abc815a92bf4a3392ef93e9a3cf4337623d9d37 /gcc
parent0b3f00889273c7ceab6c3655ab5a28ccf72419f8 (diff)
downloadgcc-c0d15a7748467574548cd61de68dbf9ae9215428.zip
gcc-c0d15a7748467574548cd61de68dbf9ae9215428.tar.gz
gcc-c0d15a7748467574548cd61de68dbf9ae9215428.tar.bz2
re PR fortran/45380 (ICE in gfc_conv_intrinsic_any_all at -O{n>0})
2010-08-23 Mikael Morin <mikael@gcc.gnu.org> PR fortran/45380 * frontend-passes.c (optimize_equality): Don't optimize array equality From-SVN: r163484
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/frontend-passes.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index eba7534..831c779 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-23 Mikael Morin <mikael@gcc.gnu.org>
+
+ PR fortran/45380
+ * frontend-passes.c (optimize_equality): Don't optimize array equality
+
2010-08-23 Janus Weil <janus@gcc.gnu.org>
PR fortran/45366
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index ce3ee9a..27ff0fe 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -399,6 +399,13 @@ optimize_equality (gfc_expr *e, bool equal)
return true;
}
+ /* An expression of type EXPR_CONSTANT is only valid for scalars. */
+ /* TODO: A scalar constant may be acceptable in some cases (the scalarizer
+ handles them well). However, there are also cases that need a non-scalar
+ argument. For example the any intrinsic. See PR 45380. */
+ if (e->rank > 0)
+ return false;
+
/* Check for direct comparison between identical variables. Don't compare
REAL or COMPLEX because of NaN checks. */
if (op1->expr_type == EXPR_VARIABLE