From: Martin Jambor <mjambor@suse.cz>
Date: Tue, 19 Jul 2016 15:44:56 +0000 (+0200)
Subject: re PR fortran/71688 (ICE in analyze, at cgraphunit.c:632 with -fcoarray=lib)
X-Git-Tag: releases/gcc-4.9.4~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e69b52f3b5f695de1bc72b45c8025d92d3ca7d07;p=thirdparty%2Fgcc.git

re PR fortran/71688 (ICE in analyze, at cgraphunit.c:632 with -fcoarray=lib)

Fix PR fortran/71688

2016-07-19  Martin Jambor  <mjambor@suse.cz>

        PR fortran/71688
        * trans-decl.c (gfc_generate_function_code): Use cgraph_get_create_node
        rather than cgraph_create_node to get a call graph node.

testsuite/
        * gfortran.dg/pr71688.f90: New test.

From-SVN: r238477
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fd6aaafb007c..77f8dfedc889 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-19  Martin Jambor  <mjambor@suse.cz>
+
+        PR fortran/71688
+        * trans-decl.c (gfc_generate_function_code): Use cgraph_get_create_node
+        rather than cgraph_create_node to get a call graph node.
+
 2016-07-19  Martin Liska  <mliska@suse.cz>
 
 	Backported from mainline
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 4b3e89b79105..331d4bc44a35 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -5778,7 +5778,7 @@ gfc_generate_function_code (gfc_namespace * ns)
 	 function has already called cgraph_create_node, which also created
 	 the cgraph node for this function.  */
       if (!has_coarray_vars || gfc_option.coarray != GFC_FCOARRAY_LIB)
-	(void) cgraph_create_node (fndecl);
+	(void) cgraph_get_create_node (fndecl);
     }
   else
     cgraph_finalize_function (fndecl, true);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 82425bb3982d..87cef82d544e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-19  Martin Jambor  <mjambor@suse.cz>
+
+        PR fortran/71688
+        * gfortran.dg/pr71688.f90: New test.
+
 2016-07-19  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
diff --git a/gcc/testsuite/gfortran.dg/pr71688.f90 b/gcc/testsuite/gfortran.dg/pr71688.f90
new file mode 100644
index 000000000000..dbb6d185cf46
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr71688.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! { dg-options "-fcoarray=lib" }
+
+program p
+   call s
+contains
+   subroutine s
+      real :: x[*] = 1
+      block
+      end block
+      x = 2
+   end
+end