Reverted r205593

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.

From-SVN: r206364

diff --git a/gcc/ChangeLog-2013 b/gcc/ChangeLog-2013
index 2c11878..7cf3c99 100644 (file)
--- a/gcc/ChangeLog-2013
+++ b/gcc/ChangeLog-2013
@@ -3854,12 +3854,6 @@
        targets like arm-none-eabi.
        * expr.c (expand_assignment): Handle normal fields like bit regions.
 
-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 8dcdb31..b43e67f 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4405,6 +4405,7 @@ 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)
@@ -4414,8 +4415,6 @@ invoke_set_current_function_hook (tree fndecl)
            this_fn_optabs = (struct target_optabs *)
              TREE_OPTIMIZATION_OPTABS (opts);
        }
-
-      targetm.set_current_function (fndecl);
     }
 }