diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2016-12-02 19:38:24 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2016-12-02 19:38:24 +0100 |
| commit | 6ed022af2addc38c0d7c2b321d279a48f73f11c4 (patch) | |
| tree | 9945c482626c336e1259469d20d9f43ff38cf904 /gcc | |
| parent | 827ab47ab1f9f9b9b108a252b7a43c3c7bc828b7 (diff) | |
| download | gcc-6ed022af2addc38c0d7c2b321d279a48f73f11c4.zip gcc-6ed022af2addc38c0d7c2b321d279a48f73f11c4.tar.gz gcc-6ed022af2addc38c0d7c2b321d279a48f73f11c4.tar.bz2 | |
[multiple changes]
2016-12-02 Janus Weil <janus@gcc.gnu.org>
Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78618
* check.c (gfc_check_rank): Remove ATTRIBUTE_UNUSED.
* expr.c (gfc_check_assign): Fix error propagation.
2016-12-02 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78618
* gfortran.dg/char_conversion.f90: New test.
From-SVN: r243201
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/check.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/char_conversion.f90 | 10 |
5 files changed, 26 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 20a9f2e..b11a999 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-12-02 Janus Weil <janus@gcc.gnu.org> + Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/78618 + * check.c (gfc_check_rank): Remove ATTRIBUTE_UNUSED. + * expr.c (gfc_check_assign): Fix error propagation. + 2016-12-01 Elizebeth Punnoose <elizebeth.punnoose@hpe.com> PR fortran/77505 diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 3b80156..3ea8391 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -3667,7 +3667,7 @@ gfc_check_range (gfc_expr *x) bool -gfc_check_rank (gfc_expr *a ATTRIBUTE_UNUSED) +gfc_check_rank (gfc_expr *a) { /* Any data object is allowed; a "data object" is a "constant (4.1.3), variable (6), or subobject of a constant (2.4.3.2.3)" (F2008, 1.3.45). */ diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 60f6080..c01418d 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3314,9 +3314,9 @@ gfc_check_assign (gfc_expr *lvalue, gfc_expr *rvalue, int conform, if (lvalue->ts.type == BT_CHARACTER && rvalue->ts.type == BT_CHARACTER) { if (lvalue->ts.kind != rvalue->ts.kind && allow_convert) - gfc_convert_chartype (rvalue, &lvalue->ts); - - return true; + return gfc_convert_chartype (rvalue, &lvalue->ts); + else + return true; } if (!allow_convert) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3a478b9..d7b90d6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-12-02 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/78618 + * gfortran.dg/char_conversion.f90: New test. + 2016-12-02 Jakub Jelinek <jakub@redhat.com> PR target/70322 diff --git a/gcc/testsuite/gfortran.dg/char_conversion.f90 b/gcc/testsuite/gfortran.dg/char_conversion.f90 new file mode 100644 index 0000000..7120a1c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/char_conversion.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! +! PR 78618: ICE in gfc_check_rank, at fortran/check.c:3670 +! +! Contributed by Gerhard Steinmetz <gerhard.steinmetz.fortran@t-online.de> + +program p + character, parameter :: c = char(256,4) ! { dg-error "cannot be converted" } + if (rank(c) /= 0) call abort +end |