re PR target/58115 (testcase gcc.target/i386/intrinsics_4.c failure)

2013-11-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        PR target/58115
        * function.c (invoke_set_current_function_hook): Call
        targetm.set_current_function after setting this_fn_optabs.

From-SVN: r205593

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38af5b76455822f118fe21d29c04d063e8c340f8..84153b09dbbe185cce225a0713541d5137592735 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       PR target/58115
+       * function.c (invoke_set_current_function_hook): Call
+       targetm.set_current_function after setting this_fn_optabs.
+
 2013-12-02  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/59139

diff --git a/gcc/function.c b/gcc/function.c
index 00c372f2bc02a5219846c7018aaa32651540c991..2c8d781e2c0322d816e78bc6c5ee950faa83b1b1 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4405,7 +4405,6 @@ invoke_set_current_function_hook (tree fndecl)
          cl_optimization_restore (&global_options, TREE_OPTIMIZATION (opts));
        }
 
-      targetm.set_current_function (fndecl);
       this_fn_optabs = this_target_optabs;
 
       if (opts != optimization_default_node)
@@ -4415,6 +4414,8 @@ invoke_set_current_function_hook (tree fndecl)
            this_fn_optabs = (struct target_optabs *)
              TREE_OPTIMIZATION_OPTABS (opts);
        }
+
+      targetm.set_current_function (fndecl);
     }
 }