From: kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 4 Mar 2005 17:09:18 +0000 (+0000)
Subject: * expr.c (gfc_copy_shape_excluding): Change && to ||.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acf17823a9eca54692510d7f6dc687007d276705;p=thirdparty%2Fgcc.git

* expr.c (gfc_copy_shape_excluding): Change && to ||.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95891 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7507564b4385..b612122dd4fe 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+Steven G. Kargl  <kargls@comcast.net>
+
+	* expr.c (gfc_copy_shape_excluding): Change && to ||.
+
 2005-03-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
 
 	* trans-intrinsic.c (gfc_get_symbol_for_expr): Fix comment typo,
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 5867f9bfaa59..f4a4b589b1fe 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -352,7 +352,7 @@ gfc_copy_shape_excluding (mpz_t * shape, int rank, gfc_expr * dim)
 
   n = mpz_get_si (dim->value.integer);
   n--; /* Convert to zero based index */
-  if (n < 0 && n >= rank)
+  if (n < 0 || n >= rank)
     return NULL;
 
   s = new_shape = gfc_get_shape (rank-1);