Reload global options when strict aliasing is dropped (PR ipa/79043).

2017-01-13  Martin Liska  <mliska@suse.cz>

	PR ipa/79043
	* function.c (set_cfun): Add new argument force.
	* function.h (set_cfun): Likewise.
	* ipa-inline-transform.c (inline_call): Use the function when
	strict alising from is dropped for function we inline to.
2017-01-13  Martin Liska  <mliska@suse.cz>

	PR ipa/79043
	* gcc.c-torture/execute/pr79043.c: New test.

From-SVN: r244435

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 21faa5884cb7ec2b8c8790e0e6b4508b918b8cc1..f14a2c1a81bdd3606e3519017189886ed011ce98 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-13  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/79043
+       * function.c (set_cfun): Add new argument force.
+       * function.h (set_cfun): Likewise.
+       * ipa-inline-transform.c (inline_call): Use the function when
+       strict alising from is dropped for function we inline to.
+
 2017-01-13  Richard Biener  <rguenther@suse.de>
 
        * tree-pretty-print.c (dump_generic_node): Fix inverted condition

diff --git a/gcc/function.c b/gcc/function.c
index 7fde96adbe37470411e0136f29c9df101e18fa71..f625489205be3f31c17b39e102dd94d6a29cda59 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4811,9 +4811,9 @@ invoke_set_current_function_hook (tree fndecl)
 /* cfun should never be set directly; use this function.  */
 
 void
-set_cfun (struct function *new_cfun)
+set_cfun (struct function *new_cfun, bool force)
 {
-  if (cfun != new_cfun)
+  if (cfun != new_cfun || force)
     {
       cfun = new_cfun;
       invoke_set_current_function_hook (new_cfun ? new_cfun->decl : NULL_TREE);

diff --git a/gcc/function.h b/gcc/function.h
index fb3cbbc334624ad0766ef4aa417db6adf2e90130..fb8f57ae3854226b6b537ae500b130685b76c1c0 100644 (file)
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -613,7 +613,7 @@ extern tree block_chainon (tree, tree);
 extern void number_blocks (tree);
 
 /* cfun shouldn't be set directly; use one of these functions instead.  */
-extern void set_cfun (struct function *new_cfun);
+extern void set_cfun (struct function *new_cfun, bool force = false);
 extern void push_cfun (struct function *new_cfun);
 extern void pop_cfun (void);
 

diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 7725fadd6d8012b447e66fc5454879c75af8b070..a8e73cd6967f6488db3535998130bcdd603c196f 100644 (file)
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -340,6 +340,8 @@ inline_call (struct cgraph_edge *e, bool update_original,
   if (DECL_FUNCTION_PERSONALITY (callee->decl))
     DECL_FUNCTION_PERSONALITY (to->decl)
       = DECL_FUNCTION_PERSONALITY (callee->decl);
+
+  bool reload_optimization_node = false;
   if (!opt_for_fn (callee->decl, flag_strict_aliasing)
       && opt_for_fn (to->decl, flag_strict_aliasing))
     {
@@ -352,6 +354,7 @@ inline_call (struct cgraph_edge *e, bool update_original,
                 to->name (), to->order);
       DECL_FUNCTION_SPECIFIC_OPTIMIZATION (to->decl)
         = build_optimization_node (&opts);
+      reload_optimization_node = true;
     }
 
   inline_summary *caller_info = inline_summaries->get (to);
@@ -412,9 +415,14 @@ inline_call (struct cgraph_edge *e, bool update_original,
                     callee->name (), callee->order, to->name (), to->order);
          DECL_FUNCTION_SPECIFIC_OPTIMIZATION (to->decl)
             = build_optimization_node (&opts);
+         reload_optimization_node = true;
        }
     }
 
+  /* Reload global optimization flags.  */
+  if (reload_optimization_node && DECL_STRUCT_FUNCTION (to->decl) == cfun)
+    set_cfun (cfun, true);
+
   /* If aliases are involved, redirect edge to the actual destination and
      possibly remove the aliases.  */
   if (e->callee != callee)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 46f46e6244ee864bcf5960ad86abc91314f5340d..33c5955009404b1131dd41b0d34405af083643f7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-13  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/79043
+       * gcc.c-torture/execute/pr79043.c: New test.
+
 2017-01-13  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/78411

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr79043.c b/gcc/testsuite/gcc.c-torture/execute/pr79043.c
new file mode 100644 (file)
index 0000000..b7fcc82
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr79043.c
@@ -0,0 +1,21 @@
+/* PR ipa/78791 */
+
+int val;
+
+int *ptr = &val;
+float *ptr2 = &val;
+
+static
+__attribute__((always_inline, optimize ("-fno-strict-aliasing")))
+typepun ()
+{
+  *ptr2=0;
+}
+
+main()
+{
+  *ptr=1;
+  typepun ();
+  if (*ptr)
+    __builtin_abort ();
+}