From: Mikael Morin <mikael@gcc.gnu.org>
Date: Mon, 9 Jan 2012 19:01:34 +0000 (+0000)
Subject: [multiple changes]
X-Git-Tag: releases/gcc-4.7.0~1095
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80508c4992478622752098e1ac43cef6a30b07b1;p=thirdparty%2Fgcc.git

[multiple changes]

2012-01-09  Mikael Morin  <mikael@gcc.gnu.org>

	PR fortran/51758
	* trans-array.c (gfc_walk_elemental_function_args):
	Skip over NULL() actual arguments.

2012-01-09  Tobias Burnus  <burnus@net-b.de>

	PR fortran/51758
	* gfortran.dg/optional_absent_2.f90: New.

From-SVN: r183024
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 29e8cabeb702..755e11ee3355 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-09  Mikael Morin  <mikael@gcc.gnu.org>
+
+	PR fortran/51758
+	* trans-array.c (gfc_walk_elemental_function_args):
+	Skip over NULL() actual arguments.
+
 2012-01-09  Tobias Burnus  <burnus@net-b.de>
 
 	* gfortran.texi: Bump copyright year.
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index b9902b9d52ec..1fd8dcb7f77c 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -8369,7 +8369,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 bab4f895fb61..565aec5ca228 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-09  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/51758
+	* gfortran.dg/optional_absent_2.f90: New.
+
 2012-01-09  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/51578
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