1 files changed, 29 insertions, 32 deletions
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index 7ba3ddb6698..2e454f553e7 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -3323,37 +3323,8 @@ rotate_partial_schedule (partial_schedule_ptr ps, int start_cycle)
 
 #endif /* INSN_SCHEDULING */
 
-static bool
-gate_handle_sms (void)
-{
-  return (optimize > 0 && flag_modulo_sched);
-}
-
-
 /* Run instruction scheduler.  */
 /* Perform SMS module scheduling.  */
-static unsigned int
-rest_of_handle_sms (void)
-{
-#ifdef INSN_SCHEDULING
-  basic_block bb;
-
-  /* Collect loop information to be used in SMS.  */
-  cfg_layout_initialize (0);
-  sms_schedule ();
-
-  /* Update the life information, because we add pseudos.  */
-  max_regno = max_reg_num ();
-
-  /* Finalize layout changes.  */
-  FOR_EACH_BB_FN (bb, cfun)
-    if (bb->next_bb != EXIT_BLOCK_PTR_FOR_FN (cfun))
-      bb->aux = bb->next_bb;
-  free_dominance_info (CDI_DOMINATORS);
-  cfg_layout_finalize ();
-#endif /* INSN_SCHEDULING */
-  return 0;
-}
 
 namespace {
 
@@ -3362,7 +3333,6 @@ const pass_data pass_data_sms =
   RTL_PASS, /* type */
   "sms", /* name */
   OPTGROUP_NONE, /* optinfo_flags */
-  true, /* has_gate */
   true, /* has_execute */
   TV_SMS, /* tv_id */
   0, /* properties_required */
@@ -3381,11 +3351,38 @@ public:
   {}
 
   /* opt_pass methods: */
-  bool gate () { return gate_handle_sms (); }
-  unsigned int execute () { return rest_of_handle_sms (); }
+  virtual bool gate (function *)
+{
+  return (optimize > 0 && flag_modulo_sched);
+}
+
+  virtual unsigned int execute (function *);
 
 }; // class pass_sms
 
+unsigned int
+pass_sms::execute (function *fun ATTRIBUTE_UNUSED)
+{
+#ifdef INSN_SCHEDULING
+  basic_block bb;
+
+  /* Collect loop information to be used in SMS.  */
+  cfg_layout_initialize (0);
+  sms_schedule ();
+
+  /* Update the life information, because we add pseudos.  */
+  max_regno = max_reg_num ();
+
+  /* Finalize layout changes.  */
+  FOR_EACH_BB_FN (bb, fun)
+    if (bb->next_bb != EXIT_BLOCK_PTR_FOR_FN (fun))
+      bb->aux = bb->next_bb;
+  free_dominance_info (CDI_DOMINATORS);
+  cfg_layout_finalize ();
+#endif /* INSN_SCHEDULING */
+  return 0;
+}
+
 } // anon namespace
 
 rtl_opt_pass *