This is the mail archive of the gcc-bugs@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Bug fortran/24774] [gomp-branch] wrong results for INQUIRE statement



------- Comment #5 from jakub at gcc dot gnu dot org  2005-11-22 10:58 -------
Subject: Bug 24774

Author: jakub
Date: Tue Nov 22 10:58:47 2005
New Revision: 107351

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=107351
Log:
gcc/fortran/
        PR fortran/14943
        PR fortran/21647
        * Make-lang.in (fortran/trans-io.o): Depend on fortran/ioparm.def.
        * dump-parse-tree.c (gfc_show_code_node): Dump c->block for
        EXEC_{READ,WRITE,IOLENGTH} nodes.
        * io.c (terminate_io, match_io, gfc_match_inquire): Put data
        transfer commands into EXEC_{READ,WRITE,IOLENGTH}'s code->block.
        * resolve.c (resolve_blocks): Handle EXEC_{READ,WRITE,IOLENGTH}.
        * trans-io.c (ioparm_unit, ioparm_err, ioparm_end, ioparm_eor,
        ioparm_list_format, ioparm_library_return, ioparm_iostat,
        ioparm_exist, ioparm_opened, ioparm_number, ioparm_named,
        ioparm_rec, ioparm_nextrec, ioparm_size, ioparm_recl_in,
        ioparm_recl_out, ioparm_iolength, ioparm_file, ioparm_file_len,
        ioparm_status, ioparm_status_len, ioparm_access, ioparm_access_len,
        ioparm_form, ioparm_form_len, ioparm_blank, ioparm_blank_len,
        ioparm_position, ioparm_position_len, ioparm_action,
        ioparm_action_len, ioparm_delim, ioparm_delim_len, ioparm_pad,
        ioparm_pad_len, ioparm_format, ioparm_format_len, ioparm_advance,
        ioparm_advance_len, ioparm_name, ioparm_name_len,
        ioparm_internal_unit, ioparm_internal_unit_len,
        ioparm_internal_unit_desc, ioparm_sequential, ioparm_sequential_len,
        ioparm_direct, ioparm_direct_len, ioparm_formatted,
        ioparm_formatted_len, ioparm_unformatted, ioparm_unformatted_len,
        ioparm_read, ioparm_read_len, ioparm_write, ioparm_write_len,
        ioparm_readwrite, ioparm_readwrite_len, ioparm_namelist_name,
        ioparm_namelist_name_len, ioparm_namelist_read_mode, ioparm_iomsg,
        ioparm_iomsg_len, ioparm_var): Remove.
        (enum ioparam_type, enum iofield_type, enum iofield,
        enum iocall): New enums.
        (gfc_st_parameter_field, gfc_st_parameter): New typedefs.
        (st_parameter, st_parameter_field, iocall): New variables.
        (ADD_FIELD, ADD_STRING): Remove.
        (dt_parm, dt_post_end_block): New variables.
        (gfc_build_st_parameter): New function.
        (gfc_build_io_library_fndecls): Use it.  Initialize iocall
        array rather than ioparm_*, add extra first arguments to
        the function types.
        (set_parameter_const): New function.
        (set_parameter_value): Add type argument, return a bitmask.
        Changed to set a field in automatic structure variable rather
        than set a field in a global _gfortran_ioparm variable.
        (set_parameter_ref): Likewise.  If requested var has different
        size than what field should point to, call with a temporary and
        then copy into the user variable.  Add postblock argument.
        (set_string): Remove var_len argument, add type argument, return
        a bitmask.  Changed to set fields in automatic structure variable
        rather than set a field in a global _gfortran_ioparm variable.
        (set_internal_unit): Remove iunit, iunit_len, iunit_desc arguments,
        add var argument.  Return a bitmask.  Changed to set fields in
        automatic structure variable rather than set a field in a global
        _gfortran_ioparm variable.
        (set_flag): Removed.
        (io_result): Add var argument.  Changed to read common.flags field
        from automatic structure variable and bitwise AND it with 3.
        (set_error_locus): Add var argument.  Changed to set fields in
        automatic structure variable rather than set a field in a global
        _gfortran_{filename,line} variables.
        (gfc_trans_open): Use gfc_start_block rather than gfc_init_block.
        Create a temporary st_parameter_* structure.  Adjust callers of
        all above mentioned functions.  Pass address of the temporary
        variable as first argument to the generated function call.
        Use iocall array rather than ioparm_* separate variables.
        (gfc_trans_close, build_filepos, gfc_trans_inquire): Likewise.
        (build_dt): Likewise.  Change first argument to tree from tree *.
        Don't dereference code->ext.dt if last_dt == INQUIRE.  Emit
        IOLENGTH argument setup here.  Set dt_parm/dt_post_end_block
        variables and gfc_trans_code the nested data transfer commands
        in code->block.
        (gfc_trans_iolength): Just set last_dt and call build_dt immediately.
        (transfer_namelist_element): Pass address of dt_parm variable
        to generated functions.  Use iocall array rather than ioparm_*
        separate variables.
        (gfc_trans_backspace, gfc_trans_endfile, gfc_trans_rewind,
        gfc_trans_flush, gfc_trans_read, gfc_trans_write): Use iocall array
        rather than ioparm_* separate variables.
        (gfc_trans_dt_end): Likewise.  Pass address of dt_parm variable
        as first argument to generated function.  Adjust io_result caller.
        Prepend dt_post_end_block before io_result code.
        (transfer_expr): Use iocall array rather than ioparm_* separate
        variables.  Pass address of dt_parm variables as first argument
        to generated functions.
        * ioparm.def: New file.
gcc/testsuite/
        PR fortran/24774
        * gfortran.dg/inquire_9.f90: New test.

        PR fortran/21647
        * gfortran.fortran-torture/execute/inquire_5.f90: New test.
libgfortran/
        PR fortran/24774
        PR fortran/14943
        PR fortran/21647
        * Makefile.am (AM_CPPFLAGS): Add gcc directories as -I paths,
        add -D_GNU_SOURCE.
        * Makefile.in: Regenerated.
        * acinclude.m4 (LIBGFOR_CHECK_SYNC_FETCH_AND_ADD,
        LIBGFOR_CHECK_GTHR_DEFAULT, LIBGFOR_CHECK_PRAGMA_WEAK): New macros.
        * configure.ac: Add them.
        * configure: Rebuilt.
        * config.h.in: Rebuilt.
        * libtool-version: Bump libgfortran.so SONAME to libgfortran.so.1.
        * libgfortran.h (library_start, show_locus, internal_error,
        generate_error, find_option): Add st_parameter_common * argument.
        (library_end): Change into a dummy macro.
        * io/io.h: Include gthr.h.
        (SUPPORTS_WEAK): Define if HAVE_PRAGMA_WEAK.
        (CHARACTER): Remove define.
        (st_parameter, global_t): Remove typedef.
        (ioparm, g, ionml, current_unit): Remove variables.
        (init_error_stream): Remove prototype.
        (CHARACTER1, CHARACTER2): Define.
        (st_parameter_common, st_parameter_open, st_parameter_close,
        st_parameter_filepos, st_parameter_inquire, st_parameter_dt): New
        typedefs.
        (IOPARM_LIBRETURN_MASK, IOPARM_LIBRETURN_OK, IOPARM_LIBRETURN_ERROR,
        IOPARM_LIBRETURN_END, IOPARM_LIBRETURN_EOR, IOPARM_ERR, IOPARM_END,
        IOPARM_EOR, IOPARM_HAS_IOSTAT, IOPARM_HAS_IOMSG, IOPARM_COMMON_MASK,
        IOPARM_OPEN_HAS_RECL_IN, IOPARM_OPEN_HAS_FILE, IOPARM_OPEN_HAS_STATUS,
        IOPARM_OPEN_HAS_ACCESS, IOPARM_OPEN_HAS_FORM, IOPARM_OPEN_HAS_BLANK,
        IOPARM_OPEN_HAS_POSITION, IOPARM_OPEN_HAS_ACTION,
        IOPARM_OPEN_HAS_DELIM, IOPARM_OPEN_HAS_PAD, IOPARM_CLOSE_HAS_STATUS,
        IOPARM_INQUIRE_HAS_EXIST, IOPARM_INQUIRE_HAS_OPENED,
        IOPARM_INQUIRE_HAS_NUMBER, IOPARM_INQUIRE_HAS_NAMED,
        IOPARM_INQUIRE_HAS_NEXTREC, IOPARM_INQUIRE_HAS_RECL_OUT,
        IOPARM_INQUIRE_HAS_FILE, IOPARM_INQUIRE_HAS_ACCESS,
        IOPARM_INQUIRE_HAS_FORM, IOPARM_INQUIRE_HAS_BLANK,
        IOPARM_INQUIRE_HAS_POSITION, IOPARM_INQUIRE_HAS_ACTION,
        IOPARM_INQUIRE_HAS_DELIM, IOPARM_INQUIRE_HAS_PAD,
        IOPARM_INQUIRE_HAS_NAME, IOPARM_INQUIRE_HAS_SEQUENTIAL,
        IOPARM_INQUIRE_HAS_DIRECT, IOPARM_INQUIRE_HAS_FORMATTED,
        IOPARM_INQUIRE_HAS_UNFORMATTED, IOPARM_INQUIRE_HAS_READ,
        IOPARM_INQUIRE_HAS_WRITE, IOPARM_INQUIRE_HAS_READWRITE,
        IOPARM_DT_LIST_FORMAT, IOPARM_DT_NAMELIST_READ_MODE,
        IOPARM_DT_HAS_REC, IOPARM_DT_HAS_SIZE, IOPARM_DT_HAS_IOLENGTH,
        IOPARM_DT_HAS_FORMAT, IOPARM_DT_HAS_ADVANCE,
        IOPARM_DT_HAS_INTERNAL_UNIT, IOPARM_DT_HAS_NAMELIST_NAME,
        IOPARM_DT_IONML_SET): Define.
        (gfc_unit): Add lock, waiting and close fields.  Change file
        from flexible array member into pointer to char.
        (open_external): Add st_parameter_open * argument.
        (find_file, file_exists): Add file and file_len arguments.
        (flush_all_units): New prototype.
        (max_offset, unit_root, unit_lock): New variable.
        (is_internal_unit, is_array_io, next_array_record,
        parse_format, next_format, unget_format, format_error,
        read_block, write_block, next_record, convert_real,
        read_a, read_f, read_l, read_x, read_radix, read_decimal,
        list_formatted_read, finish_list_read, namelist_read,
        namelist_write, write_a, write_b, write_d, write_e, write_en,
        write_es, write_f, write_i, write_l, write_o, write_x, write_z,
        list_formatted_write, get_unit): Add st_parameter_dt * argument.
        (insert_unit): Remove prototype.
        (find_or_create_unit, unlock_unit): New prototype.
        (new_unit): Return gfc_unit *.  Add st_parameter_open *
        and gfc_unit * arguments.
        (free_fnodes): Remove prototype.
        (free_format_data): New prototype.
        (scratch): Remove.
        (init_at_eol): Remove prototype.
        (free_ionml): New prototype.
        (inc_waiting_locked, predec_waiting_locked, dec_waiting_unlocked):
        New inline functions.
        * io/unit.c (max_offset, unit_root, unit_lock): New variables.
        (insert): Adjust os_error caller.
        (insert_unit): Made static.  Allocate memory here, initialize
        lock and after inserting it return it, locked.
        (delete_unit): Adjust for deletion of g.
        (find_unit_1): New function.
        (find_unit): Use it.
        (find_or_create_unit): New function.
        (get_unit): Add dtp argument, change meaning of the int argument
        as creation request flag.  Adjust for different st_* calling
        conventions, lock internal unit's lock before returning it
        and removal of g.  Call find_unit_1 instead of find_unit.
        (is_internal_unit, is_array_io): Add dtp argument, adjust for
        removal of most of global variables.
        (init_units): Initialize unit_lock.  Adjust insert_unit callers
        and adjust for g removal.
        (close_unit_1): New function.
        (close_unit): Use it.
        (unlock_unit): New function.
        (close_units): Lock unit_lock, use close_unit_1 rather than
        close_unit.
        * io/close.c (st_close): Add clp argument.  Adjust for new
        st_* calling conventions and internal function API changes.
        * io/file_pos.c (st_backspace, st_endfile, st_rewind, st_flush):
        Add fpp argument.  Adjust for new st_* calling conventions and
        internal function API changes.
        (formatted_backspace, unformatted_backspace): Likewise.  Add
        u argument.
        * io/open.c (edit_modes, st_open): Add opp argument.  Adjust for
        new st_* calling conventions and internal function API changes.
        (already_open): Likewise.  If not HAVE_UNLINK_OPEN_FILE, unlink
        scratch file.  Instead of calling close_unit just call sclose,
        free u->file if any and clear a few u fields before calling
        new_unit.
        (new_unit): Return gfc_unit *.  Add opp and u arguments.
        Adjust for new st_* calling conventions and internal function
        API changes.  Don't allocate unit here, rather than work with
        already created unit u already locked on entry.  In case
        of failure, close_unit it.
        * io/unix.c: Include unix.h.
        (BUFFER_SIZE, unix_stream): Moved to unix.h.
        (unit_to_fd): Add unlock_unit call.
        (tempfile): Add opp argument, use its fields rather than ioparm.
        (regular_file): Likewise.
        (open_external): Likewise.  Only unlink file if fd >= 0.
        (init_error_stream): Add error argument, set structure it points
        to rather than filling static variable and returning its address.
        (FIND_FILE0_DECL, FIND_FILE0_ARGS): Define.
        (find_file0): Use them.  Don't crash if u->s == NULL.
        (find_file): Add file and file_len arguments, use them instead
        of ioparm.  Add locking.  Pass either an array of 2 struct stat
        or file and file_len pair to find_file0.
        (flush_all_units_1, flush_all_units): New functions.
        (file_exists): Add file and file_len arguments, use them instead
        of ioparm.
        * io/unix.h: New file.
        * io/lock.c (ioparm, g, ionml): Remove variables.
        (library_start): Add cmp argument, adjust for new st_* calling
        conventions.
        (library_end): Remove.
        (free_ionml): New function.
        * io/inquire.c (inquire_via_unit, inquire_via_filename,
        st_inquire): Add iqp argument, adjust for new st_* calling
        conventions and internal function API changes.
        * io/format.c (FARRAY_SIZE): Decrease to 64.
        (fnode_array, format_data): New typedefs.
        (avail, array, format_string, string, error, saved_token, value,
        format_string_len, reversion_ok, saved_format): Remove variables.
        (colon_node): Add const.
        (free_fnode, free_fnodes): Remove.
        (free_format_data): New function.
        (next_char, unget_char, get_fnode, format_lex, parse_format_list,
        format_error, parse_format, revert, unget_format, next_test): Add
        fmt or dtp arguments, pass it all around, adjust for internal
        function API changes and adjust for removal of global variables.
        (next_format): Likewise.  Constify return type.
        (next_format0): Constify return type.
        * io/transfer.c (current_unit, sf_seen_eor, eor_condition, max_pos,
        skips, pending_spaces, scratch, line_buffer, advance_status,
        transfer): Remove variables.
        (transfer_integer, transfer_real, transfer_logical,
        transfer_character, transfer_complex, transfer_array, current_mode,
        read_sf, read_block, read_block_direct, write_block,
        write_block_direct, unformatted_read, unformatted_write,
        type_name, write_constant_string, require_type,
        formatted_transfer_scalar, us_read, us_write, pre_position,
        data_transfer_init, next_record_r, next_record_w, next_record,
        finalize_transfer, iolength_transfer, iolength_transfer_init,
        st_iolength, st_iolength_done, st_read, st_read_done, st_write,
        st_write_done, st_set_nml_var, st_set_nml_var_dim,
        next_array_record): Add dtp argument, pass it all around, adjust for
        internal function API changes and removal of global variables.
        * io/list_read.c (repeat_count, saved_length, saved_used,
        input_complete, at_eol, comma_flag, last_char, saved_string,
        saved_type, namelist_mode, nml_read_error, value, parse_err_msg,
        nml_err_msg, prev_nl): Remove variables.
        (push_char, free_saved, next_char, unget_char, eat_spaces,
        eat_separator, finish_separator, nml_bad_return, convert_integer,
        parse_repeat, read_logical, read_integer, read_character,
        parse_real, read_complex, read_real, check_type,
        list_formatted_read_scalar, list_formatted_read, finish_list_read,
        find_nml_node, nml_untouch_nodes, nml_match_name, nml_query,
        namelist_read): Add dtp argument, pass it all around, adjust for
        internal function API changes and removal of global variables.
        (nml_parse_qualifier): Likewise.  Add parse_err_msg argument.
        (nml_read_obj): Likewise.  Add pprev_nl, nml_err_msg, clow and
        chigh arguments.
        (nml_get_obj_data): Likewise.  Add pprev_nl and nml_err_msg
        arguments.
        (init_at_eol): Removed.
        * io/read.c (convert_real, read_l, read_a, next_char, read_decimal,
        read_radix, read_f, read_x): Add dtp argument, pass it all around,
        adjust for internal function API changes and removal of global
        variables.
        (set_integer): Adjust internal_error caller.
        * io/write.c (no_leading_blank, nml_delim): Remove variables.
        (write_a, calculate_sign, calculate_G_format, output_float,
        write_l, write_float, write_int, write_decimal, write_i, write_b,
        write_o, write_z, write_d, write_e, write_f, write_en, write_es,
        write_x, write_char, write_logical, write_integer, write_character,
        write_real, write_complex, write_separator,
        list_formatted_write_scalar, list_formatted_write, nml_write_obj,
        namelist_write): Add dtp argument, pass it all around, adjust for
        internal function API changes and removal of global variables.
        (extract_int, extract_uint, extract_real): Adjust internal_error
        callers.
        * runtime/fpu.c (_GNU_SOURCE): Don't define here.
        * runtime/error.c: Include ../io/unix.h.
        (filename, line): Remove variables.
        (st_printf): Pass address of a local variable to init_error_stream.
        (show_locus): Add cmp argument.  Use fields it points to rather than
        filename and line variables.
        (os_error, runtime_error): Remove show_locus calls.
        (internal_error): Add cmp argument.  Pass it down to show_locus.
        (generate_error): Likewise.  Use flags bitmask instead of non-NULL
        check for iostat and iomsg parameter presence, adjust for st_*
        calling convention changes.
        * runtime/stop.c (stop_numeric, stop_string): Remove show_locus
        calls.
        * runtime/pause.c (pause_numeric, pause_string): Likewise.
        * runtime/string.c: Include ../io/io.h.
        (find_option): Add cmp argument.  Pass it down to generate_error.
        * intrinsics/flush.c (recursive_flush): Remove.
        (flush_i4, flush_i8): Use flush_all_units.  Add unlock_unit
        call.
        * intrinsics/rand.c: Include ../io/io.h.
        (rand_seed_lock): New variable.
        (srand, irand): Add locking.
        (init): New constructor function.
        * intrinsics/random.c: Include ../io/io.h.
        (random_lock): New variable.
        (random_r4, random_r8, arandom_r4, arandom_r8): Add locking.
        (random_seed): Likewise.  open failed if fd < 0.  Set i correctly.
        (init): New constructor function.
        * intrinsics/system_clock.c (tp0, t0): Remove.
        (system_clock_4, system_clock_8): Don't subtract tp0/t0 from current
        time, use just integer arithmetics.
        * intrinsics/tty.c (isatty_l4, isatty_l8, ttynam_sub): Add
        unlock_unit calls.

Added:
    branches/gcc-4_1-branch/gcc/fortran/ioparm.def
      - copied unchanged from r107328, trunk/gcc/fortran/ioparm.def
    branches/gcc-4_1-branch/gcc/testsuite/gfortran.dg/inquire_9.f90
      - copied unchanged from r107328,
trunk/gcc/testsuite/gfortran.dg/inquire_9.f90
   
branches/gcc-4_1-branch/gcc/testsuite/gfortran.fortran-torture/execute/inquire_5.f90
      - copied unchanged from r107328,
trunk/gcc/testsuite/gfortran.fortran-torture/execute/inquire_5.f90
    branches/gcc-4_1-branch/libgfortran/io/unix.h
      - copied unchanged from r107328, trunk/libgfortran/io/unix.h
Modified:
    branches/gcc-4_1-branch/gcc/fortran/ChangeLog
    branches/gcc-4_1-branch/gcc/fortran/Make-lang.in
    branches/gcc-4_1-branch/gcc/fortran/dump-parse-tree.c
    branches/gcc-4_1-branch/gcc/fortran/io.c
    branches/gcc-4_1-branch/gcc/fortran/resolve.c
    branches/gcc-4_1-branch/gcc/fortran/trans-io.c
    branches/gcc-4_1-branch/gcc/testsuite/ChangeLog
    branches/gcc-4_1-branch/libgfortran/ChangeLog
    branches/gcc-4_1-branch/libgfortran/Makefile.am
    branches/gcc-4_1-branch/libgfortran/Makefile.in
    branches/gcc-4_1-branch/libgfortran/acinclude.m4
    branches/gcc-4_1-branch/libgfortran/config.h.in
    branches/gcc-4_1-branch/libgfortran/configure
    branches/gcc-4_1-branch/libgfortran/configure.ac
    branches/gcc-4_1-branch/libgfortran/intrinsics/flush.c
    branches/gcc-4_1-branch/libgfortran/intrinsics/rand.c
    branches/gcc-4_1-branch/libgfortran/intrinsics/random.c
    branches/gcc-4_1-branch/libgfortran/intrinsics/system_clock.c
    branches/gcc-4_1-branch/libgfortran/intrinsics/tty.c
    branches/gcc-4_1-branch/libgfortran/io/close.c
    branches/gcc-4_1-branch/libgfortran/io/file_pos.c
    branches/gcc-4_1-branch/libgfortran/io/format.c
    branches/gcc-4_1-branch/libgfortran/io/inquire.c
    branches/gcc-4_1-branch/libgfortran/io/io.h
    branches/gcc-4_1-branch/libgfortran/io/list_read.c
    branches/gcc-4_1-branch/libgfortran/io/lock.c
    branches/gcc-4_1-branch/libgfortran/io/open.c
    branches/gcc-4_1-branch/libgfortran/io/read.c
    branches/gcc-4_1-branch/libgfortran/io/transfer.c
    branches/gcc-4_1-branch/libgfortran/io/unit.c
    branches/gcc-4_1-branch/libgfortran/io/unix.c
    branches/gcc-4_1-branch/libgfortran/io/write.c
    branches/gcc-4_1-branch/libgfortran/libgfortran.h
    branches/gcc-4_1-branch/libgfortran/libtool-version
    branches/gcc-4_1-branch/libgfortran/runtime/error.c
    branches/gcc-4_1-branch/libgfortran/runtime/fpu.c
    branches/gcc-4_1-branch/libgfortran/runtime/pause.c
    branches/gcc-4_1-branch/libgfortran/runtime/stop.c
    branches/gcc-4_1-branch/libgfortran/runtime/string.c


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24774


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]