On 9/23/19 8:12 PM, Jerry DeLisle wrote:
On 9/23/19 8:52 AM, Bernhard Reutner-Fischer wrote:
On 22 September 2019 22:51:46 CEST, Jerry DeLisle <jvdeli...@charter.net> wrote:
Hi all,
The attached patch eliminates several warnings by adjusting which
enumerator is
used in the subject offending code. I fixed this by adding an
enumerator at the
end of the file_mode definition. This then triggered a warning in
several other
places for an unhandled case in the switch statements. I cleared those
by
throwing in an assert (false) since it cant happen unless something
really goes
wrong somehow.
I'm curious why you assert (false) instead of the usual gcc_unreachable ()?
Thanks,
Because I forgot all about gcc_unreachable. I will give it a try.
Jerry
gcc_unreachable is only defined in the gfortran frontend and not the runtime.
Therefore, I added a define to io.h which invokes __builtin_unreachable and does
not use fancy_abort. I don't think we need anything fancy.
If no objections, I will commit the attached updated patch with a new ChangeLog.
Regression tested ok.
Regards,
Jerry
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);
