diff --git a/gcc/simple-diagnostic-path.cc b/gcc/simple-diagnostic-path.cc
index b7fb74fd5605033d29ded3867a61442d77434046..5af69b60fcef01b6795e96e8e878b6f8b0cbc272 100644
--- a/gcc/simple-diagnostic-path.cc
+++ b/gcc/simple-diagnostic-path.cc
@@ -41,15 +41,6 @@ simple_diagnostic_path::simple_diagnostic_path (pretty_printer *event_pp)
   add_thread ("main");
 }
 
-/* Implementation of diagnostic_path::num_events vfunc for
-   simple_diagnostic_path: simply get the number of events in the vec.  */
-
-unsigned
-simple_diagnostic_path::num_events () const
-{
-  return m_events.length ();
-}
-
 /* Implementation of diagnostic_path::get_event vfunc for
    simple_diagnostic_path: simply return the event in the vec.  */
 
@@ -59,12 +50,6 @@ simple_diagnostic_path::get_event (int idx) const
   return *m_events[idx];
 }
 
-unsigned
-simple_diagnostic_path::num_threads () const
-{
-  return m_threads.length ();
-}
-
 const diagnostic_thread &
 simple_diagnostic_path::get_thread (diagnostic_thread_id_t idx) const
 {
diff --git a/gcc/simple-diagnostic-path.h b/gcc/simple-diagnostic-path.h
index 9988b1c24eba910e1dc6dc3bcf2942044153041d..e9a97f2d3bb5aa183af3fa2bb8c53fed6cc20e13 100644
--- a/gcc/simple-diagnostic-path.h
+++ b/gcc/simple-diagnostic-path.h
@@ -100,9 +100,9 @@ class simple_diagnostic_path : public diagnostic_path
  public:
   simple_diagnostic_path (pretty_printer *event_pp);
 
-  unsigned num_events () const final override;
+  unsigned num_events () const final override { return m_events.length (); }
   const diagnostic_event & get_event (int idx) const final override;
-  unsigned num_threads () const final override;
+  unsigned num_threads () const final override { return m_threads.length (); }
   const diagnostic_thread &
   get_thread (diagnostic_thread_id_t) const final override;
   bool