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/fortran/expr.c | |
| 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/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |