diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2019-09-28 19:14:47 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2019-09-28 19:14:47 +0000 |
| commit | 60674b3f8aca8f2b41580ce06b44117a9e6ab52e (patch) | |
| tree | 0c715004b955c23b1d7be4dc5affc53b79b740b6 /libgfortran | |
| parent | 4c59710186081ed4b2d34ccda1190d43454543db (diff) | |
re PR libfortran/91593 (Implicit enum conversions in libgfortran/io/transfer.c)
2019-09-28 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/91593
* io/io.h: Add gcc_unreachable().
* io/transfer.c (file_mode, current_mode,
formatted_transfer_scalar_read, formatted_transfer_scalar_write,
pre_position, next_record_r, next_record_w): Add and use
FORMATTED_UNSPECIFIED to enumeration.
From-SVN: r276255
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 9 | ||||
| -rw-r--r-- | libgfortran/io/io.h | 1 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 23 |
3 files changed, 25 insertions, 8 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 15d0e6a767b..e2c65075aa8 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,12 @@ +2019-09-28 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libfortran/91593 + * io/io.h: Add gcc_unreachable(). + * io/transfer.c (file_mode, current_mode, + formatted_transfer_scalar_read, formatted_transfer_scalar_write, + pre_position, next_record_r, next_record_w): Add and use + FORMATTED_UNSPECIFIED to enumeration. + 2019-09-27 Maciej W. Rozycki <macro@wdc.com> * configure: Regenerate. diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index f5e63797ba1..bcd6dde9a5b 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -32,6 +32,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include <gthr.h> +#define gcc_unreachable() __builtin_unreachable () /* POSIX 2008 specifies that the extended locale stuff is found in locale.h, but some systems have them in xlocale.h. */ diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index c43360f6332..4c5e210ce5a 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -193,7 +193,8 @@ static const st_option async_opt[] = { typedef enum { FORMATTED_SEQUENTIAL, UNFORMATTED_SEQUENTIAL, - FORMATTED_DIRECT, UNFORMATTED_DIRECT, FORMATTED_STREAM, UNFORMATTED_STREAM + FORMATTED_DIRECT, UNFORMATTED_DIRECT, FORMATTED_STREAM, + UNFORMATTED_STREAM, FORMATTED_UNSPECIFIED } file_mode; @@ -203,7 +204,7 @@ current_mode (st_parameter_dt *dtp) { file_mode m; - m = FORM_UNSPECIFIED; + m = FORMATTED_UNSPECIFIED; if (dtp->u.p.current_unit->flags.access == ACCESS_DIRECT) { @@ -1727,17 +1728,17 @@ formatted_transfer_scalar_read (st_parameter_dt *dtp, bt type, void *p, int kind case FMT_S: consume_data_flag = 0; - dtp->u.p.sign_status = SIGN_S; + dtp->u.p.sign_status = SIGN_PROCDEFINED; break; case FMT_SS: consume_data_flag = 0; - dtp->u.p.sign_status = SIGN_SS; + dtp->u.p.sign_status = SIGN_SUPPRESS; break; case FMT_SP: consume_data_flag = 0; - dtp->u.p.sign_status = SIGN_SP; + dtp->u.p.sign_status = SIGN_PLUS; break; case FMT_BN: @@ -2186,17 +2187,17 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin case FMT_S: consume_data_flag = 0; - dtp->u.p.sign_status = SIGN_S; + dtp->u.p.sign_status = SIGN_PROCDEFINED; break; case FMT_SS: consume_data_flag = 0; - dtp->u.p.sign_status = SIGN_SS; + dtp->u.p.sign_status = SIGN_SUPPRESS; break; case FMT_SP: consume_data_flag = 0; - dtp->u.p.sign_status = SIGN_SP; + dtp->u.p.sign_status = SIGN_PLUS; break; case FMT_BN: @@ -2766,6 +2767,8 @@ pre_position (st_parameter_dt *dtp) case UNFORMATTED_DIRECT: dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl; break; + case FORMATTED_UNSPECIFIED: + gcc_unreachable (); } dtp->u.p.current_unit->current_record = 1; @@ -3637,6 +3640,8 @@ next_record_r (st_parameter_dt *dtp, int done) while (p != '\n'); } break; + case FORMATTED_UNSPECIFIED: + gcc_unreachable (); } } @@ -4002,6 +4007,8 @@ next_record_w (st_parameter_dt *dtp, int done) } break; + case FORMATTED_UNSPECIFIED: + gcc_unreachable (); io_error: generate_error (&dtp->common, LIBERROR_OS, NULL); |