aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2018-09-10 23:25:33 +0200
committerJanus Weil <janus@gcc.gnu.org>2018-09-10 23:25:33 +0200
commitd4beaf2a221eb97bc7d074b99777cd780e3e0793 (patch)
tree6a12ccc8b7d6c83e132bd5e9738cb80daed54d2d /gcc
parent6f2dde9cf68ab68eeadad7cf2772bbba01c997ff (diff)
downloadgcc-d4beaf2a221eb97bc7d074b99777cd780e3e0793.zip
gcc-d4beaf2a221eb97bc7d074b99777cd780e3e0793.tar.gz
gcc-d4beaf2a221eb97bc7d074b99777cd780e3e0793.tar.bz2
re PR fortran/85395 ([F03] private clause contained in derived type acquires spurious scope)
fix PR 85395 2018-09-10 Janus Weil <janus@gcc.gnu.org> PR fortran/85395 * decl.c (match_binding_attributes): Use correct default accessibility for procedure pointer components. 2018-09-10 Janus Weil <janus@gcc.gnu.org> PR fortran/85395 * gfortran.dg/proc_ptr_comp_52.f90: New test case. From-SVN: r264196
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/decl.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/proc_ptr_comp_52.f9033
4 files changed, 46 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7cfb94e..97d97e8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-10 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/85395
+ * decl.c (match_binding_attributes): Use correct default accessibility
+ for procedure pointer components.
+
2018-09-03 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* simplify.c (gfc_simplify_modulo): Re-arrange code to test whether
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 0329883..3d19ad4 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -10570,7 +10570,8 @@ match_binding_attributes (gfc_typebound_proc* ba, bool generic, bool ppc)
done:
if (ba->access == ACCESS_UNKNOWN)
- ba->access = gfc_typebound_default_access;
+ ba->access = ppc ? gfc_current_block()->component_access
+ : gfc_typebound_default_access;
if (ppc && !seen_ptr)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c03844..dd0f878 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-10 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/85395
+ * gfortran.dg/proc_ptr_comp_52.f90: New test case.
+
2018-09-08 Marek Polacek <polacek@redhat.com>
PR c++/87150 - wrong ctor with maybe-rvalue semantics.
diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_comp_52.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_comp_52.f90
new file mode 100644
index 0000000..631c018
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_comp_52.f90
@@ -0,0 +1,33 @@
+! { dg-do compile }
+!
+! PR 85395: [F03] private clause contained in derived type acquires spurious scope
+!
+! Contributed by <cfd@mnet-mail.de>
+
+module defs
+ implicit none
+
+ type :: base
+ contains
+ private
+ end type
+
+ type :: options
+ procedure(), pointer, nopass :: ptr
+ end type
+
+ type :: t
+ private
+ procedure(), pointer, nopass, public :: ptr
+ end type
+end module
+
+
+program p
+ use defs
+ implicit none
+ type(options) :: self
+ type(t) :: dt
+ self%ptr => null()
+ dt%ptr => null()
+end