aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/dependency.c
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2010-09-07 22:50:54 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2010-09-07 22:50:54 +0000
commitc56c085331e710253ae53abd17fa152248a17e08 (patch)
tree37f836ea67602ac1a676daee90cd7f0f46e46547 /gcc/fortran/dependency.c
parentccef29e83119a42c412fbc9608a1f11ee165db5f (diff)
downloadgcc-c56c085331e710253ae53abd17fa152248a17e08.zip
gcc-c56c085331e710253ae53abd17fa152248a17e08.tar.gz
gcc-c56c085331e710253ae53abd17fa152248a17e08.tar.bz2
re PR fortran/45576 (ICE on character stuff)
2010-09-07 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/45576 * dependency.c (gfc_deb_compare_expr): Take missing optional arguments into account. 2010-09-07 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/45576 * gfortran.dg/char_length_18.f90: New test. From-SVN: r163978
Diffstat (limited to 'gcc/fortran/dependency.c')
-rw-r--r--gcc/fortran/dependency.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index 960155e..ab14e33 100644
--- a/gcc/fortran/dependency.c
+++ b/gcc/fortran/dependency.c
@@ -368,8 +368,14 @@ gfc_dep_compare_expr (gfc_expr *e1, gfc_expr *e2)
/* Compare the argument lists for equality. */
while (args1 && args2)
{
- if (gfc_dep_compare_expr (args1->expr, args2->expr) != 0)
+ /* Bitwise xor, since C has no non-bitwise xor operator. */
+ if ((args1->expr == NULL) ^ (args2->expr == NULL))
return -2;
+
+ if (args1->expr != NULL && args2->expr != NULL
+ && gfc_dep_compare_expr (args1->expr, args2->expr) != 0)
+ return -2;
+
args1 = args1->next;
args2 = args2->next;
}