From 5e846399279a46f2af917a09d078432f636ce5ea Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Sat, 22 Feb 2014 12:41:53 +0000 Subject: [PATCH] re PR fortran/59599 (Compiler internal error on intrinsic ichar) fortran/ PR fortran/59599 * trans-intrinsic.c (gfc_conv_intrinsic_ichar): Calculate the number of arguments. testsuite/ PR fortran/59599 * gfortran.dg/ichar_3.f90: New test. From-SVN: r208043 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-intrinsic.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/ichar_3.f90 | 13 +++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/ichar_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9a39dccc12d2..a11df7ba89e9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-02-22 Mikael Morin + + PR fortran/59599 + * trans-intrinsic.c (gfc_conv_intrinsic_ichar): Calculate the + number of arguments. + 2014-02-20 Janus Weil Backport from mainline diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index f7afb7869661..89dbb012f86a 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -4665,8 +4665,10 @@ static void gfc_conv_intrinsic_ichar (gfc_se * se, gfc_expr * expr) { tree args[2], type, pchartype; + int nargs; - gfc_conv_intrinsic_function_args (se, expr, args, 2); + nargs = gfc_intrinsic_argument_list_length (expr); + gfc_conv_intrinsic_function_args (se, expr, args, nargs); gcc_assert (POINTER_TYPE_P (TREE_TYPE (args[1]))); pchartype = gfc_get_pchar_type (expr->value.function.actual->expr->ts.kind); args[1] = fold_build1_loc (input_location, NOP_EXPR, pchartype, args[1]); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index beaf10997bca..fc5526c98119 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-02-22 Mikael Morin + + PR fortran/59599 + * gfortran.dg/ichar_3.f90: New test. + 2014-02-20 Janus Weil Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/ichar_3.f90 b/gcc/testsuite/gfortran.dg/ichar_3.f90 new file mode 100644 index 000000000000..d0f5c8b8cf81 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ichar_3.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! +! PR fortran/59599 +! The call to ichar was triggering an ICE. +! +! Original testcase from Fran Martinez Fadrique + +character(1) cpk(2) +integer res(2) +cpk = 'a' +res = ichar( cpk, kind=1 ) +print *, ichar( cpk, kind=1 ) +end -- 2.47.2