From: Tobias Burnus <burnus@net-b.de>
Date: Sun, 5 Jun 2011 21:11:46 +0000 (+0200)
Subject: re PR fortran/49255 (-fcheck=pointer diagnoses too much: Passing NULL pointer to... 
X-Git-Tag: upstream/12.2.0~83815
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d231ff273dc0d9d4937be8cd0c5ee53a000cf7a;p=platform%2Fupstream%2Fgcc.git

re PR fortran/49255 (-fcheck=pointer diagnoses too much: Passing NULL pointer to OPTIONAL argument)

2011-06-05  Tobias Burnus  <burnus@net-b.de>

        PR fortran/49255
        * trans-expr.c (gfc_conv_procedure_call): Fix -fcheck=pointer
        for F2008.

2011-06-05  Tobias Burnus  <burnus@net-b.de>

        PR fortran/49255
        * gfortran.dg/pointer_check_9.f90: New.
        * gfortran.dg/pointer_check_10.f90: New.

From-SVN: r174663
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 34acfed..af16e57 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-05  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/49255
+	* trans-expr.c (gfc_conv_procedure_call): Fix -fcheck=pointer
+	for F2008.
+
 2011-06-05  Andreas Schmidt  <andreas.schmidt.42@gmx.net>
 	Thomas Koenig  <tkoenig@gcc.gnu.org>
 
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index bfe966f..da4af1a 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -3269,6 +3269,12 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
 	  else
 	    goto end_pointer_check;
 
+	  /*  In Fortran 2008 it's allowed to pass a NULL pointer/nonallocated
+	      allocatable to an optional dummy, cf. 12.5.2.12.  */
+	  if (fsym != NULL && fsym->attr.optional && !attr.proc_pointer
+	      && (gfc_option.allow_std & GFC_STD_F2008) != 0)
+	    goto end_pointer_check;
+
           if (attr.optional)
 	    {
               /* If the actual argument is an optional pointer/allocatable and
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7fdb2ae..9973272 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-05  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/49255
+	* trans-expr.c (gfc_conv_procedure_call): Fix -fcheck=pointer
+	for F2008.
+
 2011-06-05  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	PR testsuite/49287
diff --git a/gcc/testsuite/gfortran.dg/pointer_check_10.f90 b/gcc/testsuite/gfortran.dg/pointer_check_10.f90
new file mode 100644
index 0000000..642f0a0
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pointer_check_10.f90
@@ -0,0 +1,16 @@
+! { dg-do run }
+! { dg-options "-fcheck=all -std=f2003 -fall-intrinsics" }
+! { dg-shouldfail "Pointer actual argument 'ptr' is not associated" }
+!
+! PR fortran/49255
+!
+! Valid F2008, invalid F95/F2003.
+!
+integer,pointer :: ptr => null()
+call foo (ptr)
+contains
+  subroutine foo (x)
+    integer, optional :: x
+    if (present (x)) call abort ()
+  end subroutine foo
+end
diff --git a/gcc/testsuite/gfortran.dg/pointer_check_9.f90 b/gcc/testsuite/gfortran.dg/pointer_check_9.f90
new file mode 100644
index 0000000..d42ba64
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pointer_check_9.f90
@@ -0,0 +1,15 @@
+! { dg-do run }
+! { dg-options "-fcheck=all -std=f2008 -fall-intrinsics" }
+!
+! PR fortran/49255
+!
+! Valid F2008, invalid F95/F2003.
+!
+integer,pointer :: ptr => null()
+call foo (ptr)
+contains
+  subroutine foo (x)
+    integer, optional :: x
+    if (present (x)) call abort ()
+  end subroutine foo
+end