From: Steven G. Kargl <kargls@comcast.net>
Date: Mon, 6 Mar 2006 20:43:22 +0000 (+0000)
Subject: simplify.c (gfc_simplify_verify): Fix return when SET=''.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9202989a98f7f0b7244cc4fe6efcb4e78833ad3d;p=gcc.git

simplify.c (gfc_simplify_verify): Fix return when SET=''.

2006-03-06  Steven G. Kargl  <kargls@comcast.net>

        * simplify.c (gfc_simplify_verify):  Fix return when SET=''.
        * gfortran.dg/verify_2.f90:  New test.

From-SVN: r111791
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e3fb42c97b3..ddb49cc2d77 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-05  Steven G. Kargl  <kargls@comcast.net>
+
+	* simplify.c (gfc_simplify_verify):  Fix return when SET=''.
+
 2005-03-05  Erik Edelmann  <eedelman@gcc.gnu.org>
 
 	PR fortran/16136
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index b47707896ae..d5dfb344fcb 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -3759,7 +3759,7 @@ gfc_simplify_verify (gfc_expr * s, gfc_expr * set, gfc_expr * b)
     {
       if (lenset == 0)
 	{
-	  mpz_set_ui (result->value.integer, len);
+	  mpz_set_ui (result->value.integer, 1);
 	  return result;
 	}
 
@@ -3773,7 +3773,7 @@ gfc_simplify_verify (gfc_expr * s, gfc_expr * set, gfc_expr * b)
     {
       if (lenset == 0)
 	{
-	  mpz_set_ui (result->value.integer, 1);
+	  mpz_set_ui (result->value.integer, len);
 	  return result;
 	}
       for (index = len; index > 0; index --)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 14a14695f6e..8329ae401b2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-06  Steven G. Kargl  <kargls@comcast.net>
+
+	* gfortran.dg/verify_2.f90: New test.
+
 2006-03-06  Steven G. Kargl  <kargls@comcast.net>
 
 	* gfortran.dg/equiv_1.f90: Replace tab(s) with spaces.
diff --git a/gcc/testsuite/gfortran.dg/verify_2.f90 b/gcc/testsuite/gfortran.dg/verify_2.f90
new file mode 100644
index 00000000000..705d775047f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/verify_2.f90
@@ -0,0 +1,11 @@
+! { dg-do run }
+program verify_2
+  character(len=3) s1, s2
+  s1 = 'abc'
+  s2 = ''
+  if (verify('ab', '') /= 1) call abort
+  if (verify(s1, s2)   /= 1) call abort
+  if (verify('abc', '', .true.) /= 3) call abort
+  if (verify(s1, s2, .true.) /= 3) call abort
+end program verify_2
+