From 97ad3aef459c78ceca7c42f214dfd618db174d82 Mon Sep 17 00:00:00 2001
From: Cesar Philippidis <cesar@codesourcery.com>
Date: Fri, 9 Dec 2016 06:45:54 -0800
Subject: [PATCH] re PR ipa/78027 (ICE in new_oacc_loop_routine, at
 omp-low.c:19000)

	PR ipa/78027

	gcc/
	* ipa-icf.c (sem_function::parse): Don't process functions with
	oacc decl attributes, as they may be OpenACC routines.

	gcc/testsuite/
	* c-c++-common/goacc/acc-icf.c: New test.
	* gfortran.dg/goacc/pr78027.f90: New test.

From-SVN: r243488
---
 gcc/ChangeLog                               |  6 +++
 gcc/ipa-icf.c                               |  4 ++
 gcc/testsuite/ChangeLog                     |  6 +++
 gcc/testsuite/c-c++-common/goacc/acc-icf.c  | 49 +++++++++++++++++++++
 gcc/testsuite/gfortran.dg/goacc/pr78027.f90 | 20 +++++++++
 5 files changed, 85 insertions(+)
 create mode 100644 gcc/testsuite/c-c++-common/goacc/acc-icf.c
 create mode 100644 gcc/testsuite/gfortran.dg/goacc/pr78027.f90

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91dfc18bf9f..2cf9595aebf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-09  Cesar Philippidis  <cesar@codesourcery.com>
+
+	PR ipa/78027
+	* ipa-icf.c (sem_function::parse): Don't process functions with
+	oacc decl attributes, as they may be OpenACC routines.
+
 2016-12-09  David Malcolm  <dmalcolm@redhat.com>
 
 	* rtl.h (get_mem_attrs): Add "const" qualifier to returned
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 553b81ee38c..31061e9d89b 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -1689,6 +1689,10 @@ sem_function::parse (cgraph_node *node, bitmap_obstack *stack)
   if (lookup_attribute_by_prefix ("omp ", DECL_ATTRIBUTES (node->decl)) != NULL)
     return NULL;
 
+  if (lookup_attribute_by_prefix ("oacc ",
+				  DECL_ATTRIBUTES (node->decl)) != NULL)
+    return NULL;
+
   /* PR ipa/70306.  */
   if (DECL_STATIC_CONSTRUCTOR (node->decl)
       || DECL_STATIC_DESTRUCTOR (node->decl))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6390bdaa342..6c41c41acb3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-09  Cesar Philippidis  <cesar@codesourcery.com>
+
+	PR ipa/78027
+	* c-c++-common/goacc/acc-icf.c: New test.
+	* gfortran.dg/goacc/pr78027.f90: New test.
+
 2015-12-09  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	PR target/78733
diff --git a/gcc/testsuite/c-c++-common/goacc/acc-icf.c b/gcc/testsuite/c-c++-common/goacc/acc-icf.c
new file mode 100644
index 00000000000..ecfe3f2bbec
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/goacc/acc-icf.c
@@ -0,0 +1,49 @@
+/* Ensure that IPA-ICF is disabled on OpenACC routines.  */
+
+/* { dg-additional-options "-fopenacc -O2 -fdump-ipa-icf" }  */
+
+#pragma acc routine gang
+int
+routine1 (int n)
+{
+  int i;
+
+  #pragma acc loop
+  for (i = 0; i < n; i++)
+    ;
+
+  return n + 1;
+}
+
+#pragma acc routine gang
+int
+routine2 (int n)
+{
+  int i;
+
+  #pragma acc loop
+  for (i = 0; i < n; i++)
+    ;
+
+  return n + 1;
+}
+
+int
+main ()
+{
+  int i;
+
+  #pragma acc parallel loop
+  for (i = 0; i < 8; i++)
+    ;
+
+  #pragma acc parallel loop
+  for (i = 0; i < 8; i++)
+    ;
+
+  return 0;
+}
+
+/* { dg-final { scan-ipa-dump-times "Not parsed function:" 4 "icf" } }  */
+/* { dg-final { scan-ipa-dump "Parsed function:main" "icf" } }  */
+
diff --git a/gcc/testsuite/gfortran.dg/goacc/pr78027.f90 b/gcc/testsuite/gfortran.dg/goacc/pr78027.f90
new file mode 100644
index 00000000000..db65063bede
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/pr78027.f90
@@ -0,0 +1,20 @@
+! { dg-additional-options "-fopenmp -O2 -fdump-ipa-icf" }
+
+real function f()
+   !$omp declare target(f)
+   f = 1.
+   !$acc parallel
+   !$acc loop
+   do i = 1, 8
+   end do
+   !$acc end parallel
+   !$acc parallel
+   !$acc loop
+   do i = 1, 8
+   end do
+   !$acc end parallel
+ end
+ 
+! { dg-final { scan-ipa-dump "Not parsed function:f_._omp_fn.1" "icf" } }
+! { dg-final { scan-ipa-dump "Not parsed function:f_._omp_fn.0" "icf" } }
+! { dg-final { scan-ipa-dump "Not parsed function:f_" "icf" } }
-- 
2.30.2