diff options
| author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2014-06-15 16:58:53 +0000 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2014-06-15 16:58:53 +0000 |
| commit | a416c4c766df05b1e85dcee2fe7857e9a6e87b88 (patch) | |
| tree | d08324947894c4c45c1d88bc91e42afa45a1acd2 /gcc/fortran/iresolve.c | |
| parent | 6faf47517f3a989140af3d054c75718bfcc20581 (diff) | |
| download | gcc-a416c4c766df05b1e85dcee2fe7857e9a6e87b88.zip gcc-a416c4c766df05b1e85dcee2fe7857e9a6e87b88.tar.gz gcc-a416c4c766df05b1e85dcee2fe7857e9a6e87b88.tar.bz2 | |
re PR fortran/28484 ([F03] system_clock with real-type count_rate does not compile)
PR fortran/28484
PR fortran/61429
* check.c (gfc_check_system_clock): Improve checking of arguments.
* intrinsic.texi: Update doc of SYSTEM_CLOCK.
* iresolve.c (gfc_resolve_system_clock): Choose library function
used depending on argument kinds.
* trans-decl.c (gfc_build_intrinsic_function_decls): Build
decls for system_clock_4 and system_clock_8.
* trans-intrinsic.c (conv_intrinsic_system_clock): New function.
(gfc_conv_intrinsic_subroutine): Call conv_intrinsic_system_clock.
* trans.h (gfor_fndecl_system_clock4, gfor_fndecl_system_clock8):
New variables.
* gfortran.dg/system_clock_1.f90: New file.
* gfortran.dg/system_clock_2.f90: New file.
From-SVN: r211686
Diffstat (limited to 'gcc/fortran/iresolve.c')
| -rw-r--r-- | gcc/fortran/iresolve.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index d029f720..f9a69fe 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -3293,13 +3293,14 @@ gfc_resolve_system_clock (gfc_code *c) { const char *name; int kind; - - if (c->ext.actual->expr != NULL) - kind = c->ext.actual->expr->ts.kind; - else if (c->ext.actual->next->expr != NULL) - kind = c->ext.actual->next->expr->ts.kind; - else if (c->ext.actual->next->next->expr != NULL) - kind = c->ext.actual->next->next->expr->ts.kind; + gfc_expr *count = c->ext.actual->expr; + gfc_expr *count_max = c->ext.actual->next->next->expr; + + /* The INTEGER(8) version has higher precision, it is used if both COUNT + and COUNT_MAX can hold 64-bit values, or are absent. */ + if ((!count || count->ts.kind >= 8) + && (!count_max || count_max->ts.kind >= 8)) + kind = 8; else kind = gfc_default_integer_kind; |