diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38af5b76455..84153b09dbb 100644
--- 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 00c372f2bc0..2c8d781e2c0 100644
--- 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);
     }
 }