aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2015-10-20 00:31:48 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2015-10-20 00:31:48 +0000
commitb6969536a04af6c7c605773a92fce47a7ce115dd (patch)
tree74cdde336f00d60e72b2eddcd618bd727e479a40
parentf7ddf3f349394d39a8f73f498da3f726ce326ea7 (diff)
downloadgcc-b6969536a04af6c7c605773a92fce47a7ce115dd.zip
gcc-b6969536a04af6c7c605773a92fce47a7ce115dd.tar.gz
gcc-b6969536a04af6c7c605773a92fce47a7ce115dd.tar.bz2
resolve.c (gfc_verify_binding_labels): Check for NULL pointer.
2015-10-19 Steven G. Kargl <kargl@gcc.gnu.org> * resolve.c (gfc_verify_binding_labels): Check for NULL pointer. 2015-10-19 Steven G. Kargl <kargl@gcc.gnu.org> * gfortran.dg/pr67900.f90: New tests. From-SVN: r229013
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/resolve.c2
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gfortran.dg/pr67900.f9019
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0b94ad7..44c60fa 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
2015-10-19 Steven G. Kargl <kargl@gcc.gnu.org>
+ * resolve.c (gfc_verify_binding_labels): Check for NULL pointer.
+
+2015-10-19 Steven G. Kargl <kargl@gcc.gnu.org>
+
PR fortran/68019
* decl.c (add_init_expr_to_sym): Remove an assert() to allow an error
message to be issued.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 491507b..8798d4d 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -10800,7 +10800,7 @@ gfc_verify_binding_labels (gfc_symbol *sym)
sym->binding_label = NULL;
}
- else if (sym->attr.flavor == FL_VARIABLE
+ else if (sym->attr.flavor == FL_VARIABLE && module
&& (strcmp (module, gsym->mod_name) != 0
|| strcmp (sym->name, gsym->sym_name) != 0))
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a32885..51fb895 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-19 Steven G. Kargl <kargl@gcc.gnu.org>
+
+ * gfortran.dg/pr67900.f90: New tests.
+
2015-10-19 Pierre-Marie de Rodat <derodat@adacore.com>
* gnat.dg/opt50.adb: New test.
diff --git a/gcc/testsuite/gfortran.dg/pr67900.f90 b/gcc/testsuite/gfortran.dg/pr67900.f90
new file mode 100644
index 0000000..c077fbc
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr67900.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! PR fortran/67900
+! Original code contributed by Giorgian Borca-Tasciuc
+! giorgianb at gmail dot com
+!
+program main
+ implicit none
+ interface f
+ function f_real(x)
+ real, bind(c) :: x
+ real :: f_real
+ end function f_real
+
+ function f_integer(x)
+ integer, bind(c) :: x
+ integer :: f_integer
+ end function f_integer
+ end interface f
+end program main