From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 7 Feb 2014 23:54:17 +0000 (+0100)
Subject: re PR ipa/60026 (ICE at -O3 on valid code (with the optimize pragma) on x86_64-linux... 
X-Git-Tag: releases/gcc-4.9.0~1004
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d31d42c74d6f47d4f2082f7675f292be4af951d4;p=thirdparty%2Fgcc.git

re PR ipa/60026 (ICE at -O3 on valid code (with the optimize pragma) on x86_64-linux-gnu)

	PR ipa/60026
	* ipa-cp.c (determine_versionability): Fail at -O0
	or __attribute__((optimize (0))) or -fno-ipa-cp functions.
	* tree-sra.c (ipa_sra_preliminary_function_checks): Similarly.

	Revert:
	2014-02-04  Jakub Jelinek  <jakub@redhat.com>

	PR ipa/60026
	* tree-inline.c (copy_forbidden): Fail for
	__attribute__((optimize (0))) functions.

From-SVN: r207621
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b69091eec053..9bed95db219b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2014-02-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ipa/60026
+	* ipa-cp.c (determine_versionability): Fail at -O0
+	or __attribute__((optimize (0))) or -fno-ipa-cp functions.
+	* tree-sra.c (ipa_sra_preliminary_function_checks): Similarly.
+
+	Revert:
+	2014-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ipa/60026
+	* tree-inline.c (copy_forbidden): Fail for
+	__attribute__((optimize (0))) functions.
+
 2014-02-07  Jan Hubicka  <hubicka@ucw.cz>
 
 	* varpool.c: Include pointer-set.h.
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index a2682bbe18d4..d93b45c10688 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -430,6 +430,9 @@ determine_versionability (struct cgraph_node *node)
     reason = "not a tree_versionable_function";
   else if (cgraph_function_body_availability (node) <= AVAIL_OVERWRITABLE)
     reason = "insufficient body availability";
+  else if (!opt_for_fn (node->decl, optimize)
+	   || !opt_for_fn (node->decl, flag_ipa_cp))
+    reason = "non-optimized function";
   else if (lookup_attribute ("omp declare simd", DECL_ATTRIBUTES (node->decl)))
     {
       /* Ideally we should clone the SIMD clones themselves and create
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index ade78b22a12a..439ef4c2933a 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -3315,18 +3315,6 @@ copy_forbidden (struct function *fun, tree fndecl)
 	goto fail;
       }
 
-  tree fs_opts;
-  fs_opts = DECL_FUNCTION_SPECIFIC_OPTIMIZATION (fun->decl);
-  if (fs_opts)
-    {
-      struct cl_optimization *os = TREE_OPTIMIZATION (fs_opts);
-      if (!os->x_optimize)
-	{
-	  reason = G_("function %q+F compiled without optimizations");
-	  goto fail;
-	}
-    }
-
  fail:
   fun->cannot_be_copied_reason = reason;
   fun->cannot_be_copied_set = true;
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 4992b4c13bf4..4071274419f4 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -4900,6 +4900,14 @@ ipa_sra_preliminary_function_checks (struct cgraph_node *node)
       return false;
     }
 
+  if (!opt_for_fn (node->decl, optimize)
+      || !opt_for_fn (node->decl, flag_ipa_sra))
+    {
+      if (dump_file)
+	fprintf (dump_file, "Function not optimized.\n");
+      return false;
+    }
+
   if (DECL_VIRTUAL_P (current_function_decl))
     {
       if (dump_file)