aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/simplify.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@gcc.gnu.org>2012-09-17 19:53:37 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2012-09-17 19:53:37 +0200
commit61aa9333bad2876fb298f454dfd3d42836226f5e (patch)
tree78a487dabf506ac90d65b5d1faa23368d7747b19 /gcc/fortran/simplify.c
parentf588eb27dd5ec50e54b282096211228dead9d4ba (diff)
downloadgcc-61aa9333bad2876fb298f454dfd3d42836226f5e.zip
gcc-61aa9333bad2876fb298f454dfd3d42836226f5e.tar.gz
gcc-61aa9333bad2876fb298f454dfd3d42836226f5e.tar.bz2
re PR fortran/54608 (Wrong-code with SCAN and VERIFY)
2012-09-17 Tobias Burnus <burnus@net-b.de> PR fortran/54608 * simplify.c (gfc_simplify_scan, gfc_simplify_verify): Fix handling of BACK=variable. 2012-09-17 Tobias Burnus <burnus@net-b.de> PR fortran/54608 * gfortran.dg/scan_2.f90: New. From-SVN: r191403
Diffstat (limited to 'gcc/fortran/simplify.c')
-rw-r--r--gcc/fortran/simplify.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 5aa2704..1c9dff2 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -5247,7 +5247,8 @@ gfc_simplify_scan (gfc_expr *e, gfc_expr *c, gfc_expr *b, gfc_expr *kind)
if (k == -1)
return &gfc_bad_expr;
- if (e->expr_type != EXPR_CONSTANT || c->expr_type != EXPR_CONSTANT)
+ if (e->expr_type != EXPR_CONSTANT || c->expr_type != EXPR_CONSTANT
+ || ( b != NULL && b->expr_type != EXPR_CONSTANT))
return NULL;
if (b != NULL && b->value.logical != 0)
@@ -6335,7 +6336,8 @@ gfc_simplify_verify (gfc_expr *s, gfc_expr *set, gfc_expr *b, gfc_expr *kind)
if (k == -1)
return &gfc_bad_expr;
- if (s->expr_type != EXPR_CONSTANT || set->expr_type != EXPR_CONSTANT)
+ if (s->expr_type != EXPR_CONSTANT || set->expr_type != EXPR_CONSTANT
+ || ( b != NULL && b->expr_type != EXPR_CONSTANT))
return NULL;
if (b != NULL && b->value.logical != 0)