From 725de5ee6dc6867d71e7d73d7577c2bdf6b2e889 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Sat, 14 Jul 2012 15:24:12 +0000 Subject: [PATCH] backport: [multiple changes] 2012-07-14 Mikael Morin Backport from trunk: 2012-01-09 Mikael Morin PR fortran/51758 * trans-array.c (gfc_walk_elemental_function_args): Skip over NULL() actual arguments. 2012-07-14 Mikael Morin Backport from trunk: 2012-01-09 Tobias Burnus PR fortran/51758 * gfortran.dg/optional_absent_2.f90: New. From-SVN: r189480 --- gcc/fortran/ChangeLog | 9 ++++ gcc/fortran/trans-array.c | 2 +- gcc/testsuite/ChangeLog | 8 +++ .../gfortran.dg/optional_absent_2.f90 | 53 +++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/optional_absent_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b752efb264d3..28f27db020e6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2012-07-14 Mikael Morin + + Backport from trunk: + 2012-01-09 Mikael Morin + + PR fortran/51758 + * trans-array.c (gfc_walk_elemental_function_args): + Skip over NULL() actual arguments. + 2012-06-14 Tobias Burnus PR fortran/53597 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index d0d0900eb1d6..ce8985c23406 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -7553,7 +7553,7 @@ gfc_walk_elemental_function_args (gfc_ss * ss, gfc_actual_arglist *arg, scalar = 1; for (; arg; arg = arg->next) { - if (!arg->expr) + if (!arg->expr || arg->expr->expr_type == EXPR_NULL) continue; newss = gfc_walk_subexpr (head, arg->expr); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 559c44e29104..409314516bfc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-07-14 Mikael Morin + + Backport from trunk: + 2012-01-09 Tobias Burnus + + PR fortran/51758 + * gfortran.dg/optional_absent_2.f90: New. + 2012-07-03 Michael Hope PR c++/53814 diff --git a/gcc/testsuite/gfortran.dg/optional_absent_2.f90 b/gcc/testsuite/gfortran.dg/optional_absent_2.f90 new file mode 100644 index 000000000000..717bab7e7bdc --- /dev/null +++ b/gcc/testsuite/gfortran.dg/optional_absent_2.f90 @@ -0,0 +1,53 @@ +! { dg-do run } +! +! PR fortran/51758 +! +! Contributed by Mikael Morin +! +! Check whether passing NULL() to an elemental procedure works, +! where NULL() denotes an absent optional argument. +! +program p + + integer :: a(2) + integer :: b + + a = 0 + a = foo((/ 1, 1 /), null()) +! print *, a + if (any(a /= 2)) call abort + + a = 0 + a = bar((/ 1, 1 /), null()) +! print *, a + if (any(a /= 2)) call abort + + b = 0 + b = bar(1, null()) +! print *, b + if (b /= 2) call abort + +contains + + function foo(a, b) + integer :: a(:) + integer, optional :: b(:) + integer :: foo(size(a)) + + if (present(b)) call abort + + foo = 2 + end function foo + + elemental function bar(a, b) + integer, intent(in) :: a + integer, intent(in), optional :: b + integer :: bar + + bar = 2 + + if (present(b)) bar = 1 + + end function bar + +end program p -- 2.47.2