[2/2] jit: use FINAL and OVERRIDE throughout

diff --git a/gcc/jit/jit-playback.h b/gcc/jit/jit-playback.h
index 7519bc4..905747c 100644
--- a/gcc/jit/jit-playback.h
+++ b/gcc/jit/jit-playback.h
@@ -314,7 +314,7 @@  class compile_to_memory : public context
 {
  public:
   compile_to_memory (recording::context *ctxt);
-  void postprocess (const char *ctxt_progname);
+  void postprocess (const char *ctxt_progname) FINAL OVERRIDE;
 
   result *get_result_obj () const { return m_result; }
 
@@ -328,7 +328,7 @@  class compile_to_file : public context
   compile_to_file (recording::context *ctxt,
 		   enum gcc_jit_output_kind output_kind,
 		   const char *output_path);
-  void postprocess (const char *ctxt_progname);
+  void postprocess (const char *ctxt_progname) FINAL OVERRIDE;
 
  private:
   void
@@ -414,7 +414,7 @@  public:
   function(context *ctxt, tree fndecl, enum gcc_jit_function_kind kind);
 
   void gt_ggc_mx ();
-  void finalizer ();
+  void finalizer () FINAL OVERRIDE;
 
   tree get_return_type_as_tree () const;
 
@@ -475,7 +475,7 @@  public:
   block (function *func,
 	 const char *name);
 
-  void finalizer ();
+  void finalizer () FINAL OVERRIDE;
 
   tree as_label_decl () const { return m_label_decl; }
 
@@ -619,7 +619,7 @@  class source_file : public wrapper
 {
 public:
   source_file (tree filename);
-  void finalizer ();
+  void finalizer () FINAL OVERRIDE;
 
   source_line *
   get_source_line (int line_num);
@@ -640,7 +640,7 @@  class source_line : public wrapper
 {
 public:
   source_line (source_file *file, int line_num);
-  void finalizer ();
+  void finalizer () FINAL OVERRIDE;
 
   location *
   get_location (recording::location *rloc, int column_num);
diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
index 41556db..8f5f914 100644
--- a/gcc/jit/jit-recording.c
+++ b/gcc/jit/jit-recording.c
@@ -3015,7 +3015,7 @@  class rvalue_usage_validator : public recording::rvalue_visitor
 			  recording::statement *stmt);
 
   void
-  visit (recording::rvalue *rvalue);
+  visit (recording::rvalue *rvalue) FINAL OVERRIDE;
 
  private:
   const char *m_api_funcname;
diff --git a/gcc/jit/jit-recording.h b/gcc/jit/jit-recording.h
index d99c752..1c3e763 100644
--- a/gcc/jit/jit-recording.h
+++ b/gcc/jit/jit-recording.h
@@ -401,11 +401,11 @@  public:
   static string * from_printf (context *ctxt, const char *fmt, ...)
     GNU_PRINTF(2, 3);
 
-  void replay_into (replayer *) {}
+  void replay_into (replayer *) FINAL OVERRIDE {}
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   size_t m_len;
@@ -424,7 +424,7 @@  public:
     m_created_by_user (created_by_user)
  {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
   playback::location *
   playback_location (replayer *r)
@@ -453,12 +453,12 @@  public:
     return static_cast <playback::location *> (m_playback_obj);
   }
 
-  location *dyn_cast_location () { return this; }
+  location *dyn_cast_location () FINAL OVERRIDE { return this; }
   bool created_by_user () const { return m_created_by_user; }
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   string *m_filename;
@@ -538,9 +538,9 @@  public:
   : type (ctxt),
     m_kind (kind) {}
 
-  type *dereference ();
+  type *dereference () FINAL OVERRIDE;
 
-  bool accepts_writes_from (type *rtype)
+  bool accepts_writes_from (type *rtype) FINAL OVERRIDE
   {
     if (m_kind == GCC_JIT_TYPE_VOID_PTR)
       if (rtype->is_pointer ())
@@ -553,19 +553,19 @@  public:
     return type::accepts_writes_from (rtype);
   }
 
-  bool is_int () const;
-  bool is_float () const;
-  bool is_bool () const;
-  type *is_pointer () { return dereference (); }
-  type *is_array () { return NULL; }
-  bool is_void () const { return m_kind == GCC_JIT_TYPE_VOID; }
+  bool is_int () const FINAL OVERRIDE;
+  bool is_float () const FINAL OVERRIDE;
+  bool is_bool () const FINAL OVERRIDE;
+  type *is_pointer () FINAL OVERRIDE { return dereference (); }
+  type *is_array () FINAL OVERRIDE { return NULL; }
+  bool is_void () const FINAL OVERRIDE { return m_kind == GCC_JIT_TYPE_VOID; }
 
 public:
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   enum gcc_jit_types m_kind;
@@ -579,21 +579,21 @@  public:
   : type (other_type->m_ctxt),
     m_other_type (other_type) {}
 
-  type *dereference () { return m_other_type; }
+  type *dereference () FINAL OVERRIDE { return m_other_type; }
 
-  bool accepts_writes_from (type *rtype);
+  bool accepts_writes_from (type *rtype) FINAL OVERRIDE;
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  bool is_int () const { return false; }
-  bool is_float () const { return false; }
-  bool is_bool () const { return false; }
-  type *is_pointer () { return m_other_type; }
-  type *is_array () { return NULL; }
+  bool is_int () const FINAL OVERRIDE { return false; }
+  bool is_float () const FINAL OVERRIDE { return false; }
+  bool is_bool () const FINAL OVERRIDE { return false; }
+  type *is_pointer () FINAL OVERRIDE { return m_other_type; }
+  type *is_array () FINAL OVERRIDE { return NULL; }
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   type *m_other_type;
@@ -607,28 +607,28 @@  public:
   : type (other_type->m_ctxt),
     m_other_type (other_type) {}
 
-  type *dereference () { return m_other_type->dereference (); }
+  type *dereference () FINAL OVERRIDE { return m_other_type->dereference (); }
 
-  bool accepts_writes_from (type */*rtype*/)
+  bool accepts_writes_from (type */*rtype*/) FINAL OVERRIDE
   {
     /* Can't write to a "const".  */
     return false;
   }
 
   /* Strip off the "const", giving the underlying type.  */
-  type *unqualified () { return m_other_type; }
+  type *unqualified () FINAL OVERRIDE { return m_other_type; }
 
-  bool is_int () const { return m_other_type->is_int (); }
-  bool is_float () const { return m_other_type->is_float (); }
-  bool is_bool () const { return m_other_type->is_bool (); }
-  type *is_pointer () { return m_other_type->is_pointer (); }
-  type *is_array () { return m_other_type->is_array (); }
+  bool is_int () const FINAL OVERRIDE { return m_other_type->is_int (); }
+  bool is_float () const FINAL OVERRIDE { return m_other_type->is_float (); }
+  bool is_bool () const FINAL OVERRIDE { return m_other_type->is_bool (); }
+  type *is_pointer () FINAL OVERRIDE { return m_other_type->is_pointer (); }
+  type *is_array () FINAL OVERRIDE { return m_other_type->is_array (); }
 
-  void replay_into (replayer *);
+  void replay_into (replayer *) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   type *m_other_type;
@@ -642,22 +642,22 @@  public:
   : type (other_type->m_ctxt),
     m_other_type (other_type) {}
 
-  type *dereference () { return m_other_type->dereference (); }
+  type *dereference () FINAL OVERRIDE { return m_other_type->dereference (); }
 
   /* Strip off the "volatile", giving the underlying type.  */
-  type *unqualified () { return m_other_type; }
+  type *unqualified () FINAL OVERRIDE { return m_other_type; }
 
-  bool is_int () const { return m_other_type->is_int (); }
-  bool is_float () const { return m_other_type->is_float (); }
-  bool is_bool () const { return m_other_type->is_bool (); }
-  type *is_pointer () { return m_other_type->is_pointer (); }
-  type *is_array () { return m_other_type->is_array (); }
+  bool is_int () const FINAL OVERRIDE { return m_other_type->is_int (); }
+  bool is_float () const FINAL OVERRIDE { return m_other_type->is_float (); }
+  bool is_bool () const FINAL OVERRIDE { return m_other_type->is_bool (); }
+  type *is_pointer () FINAL OVERRIDE { return m_other_type->is_pointer (); }
+  type *is_array () FINAL OVERRIDE { return m_other_type->is_array (); }
 
-  void replay_into (replayer *);
+  void replay_into (replayer *) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   type *m_other_type;
@@ -676,19 +676,19 @@  class array_type : public type
     m_num_elements (num_elements)
   {}
 
-  type *dereference ();
+  type *dereference () FINAL OVERRIDE;
 
-  bool is_int () const { return false; }
-  bool is_float () const { return false; }
-  bool is_bool () const { return false; }
-  type *is_pointer () { return NULL; }
-  type *is_array () { return m_element_type; }
+  bool is_int () const FINAL OVERRIDE { return false; }
+  bool is_float () const FINAL OVERRIDE { return false; }
+  bool is_bool () const FINAL OVERRIDE { return false; }
+  type *is_pointer () FINAL OVERRIDE { return NULL; }
+  type *is_array () FINAL OVERRIDE { return m_element_type; }
 
-  void replay_into (replayer *);
+  void replay_into (replayer *) FINAL OVERRIDE;
 
  private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
  private:
   location *m_loc;
@@ -705,17 +705,17 @@  public:
 		 type **param_types,
 		 int is_variadic);
 
-  type *dereference ();
-  function_type *dyn_cast_function_type () { return this; }
-  function_type *as_a_function_type () { return this; }
+  type *dereference () FINAL OVERRIDE;
+  function_type *dyn_cast_function_type () FINAL OVERRIDE { return this; }
+  function_type *as_a_function_type () FINAL OVERRIDE { return this; }
 
-  bool is_int () const { return false; }
-  bool is_float () const { return false; }
-  bool is_bool () const { return false; }
-  type *is_pointer () { return NULL; }
-  type *is_array () { return NULL; }
+  bool is_int () const FINAL OVERRIDE { return false; }
+  bool is_float () const FINAL OVERRIDE { return false; }
+  bool is_bool () const FINAL OVERRIDE { return false; }
+  type *is_pointer () FINAL OVERRIDE { return NULL; }
+  type *is_array () FINAL OVERRIDE { return NULL; }
 
-  void replay_into (replayer *);
+  void replay_into (replayer *) FINAL OVERRIDE;
 
   type * get_return_type () const { return m_return_type; }
   const vec<type *> &get_param_types () const { return m_param_types; }
@@ -728,9 +728,9 @@  public:
 			     memento *ptr_type);
 
  private:
-  string * make_debug_string ();
+  string * make_debug_string () FINAL OVERRIDE;
   string * make_debug_string_with (const char *);
-  void write_reproducer (reproducer &r);
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   type *m_return_type;
@@ -757,9 +757,9 @@  public:
   compound_type * get_container () const { return m_container; }
   void set_container (compound_type *c) { m_container = c; }
 
-  void replay_into (replayer *);
+  void replay_into (replayer *) FINAL OVERRIDE;
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
   playback::field *
   playback_field () const
@@ -768,8 +768,8 @@  public:
   }
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   location *m_loc;
@@ -795,15 +795,15 @@  public:
 	      int num_fields,
 	      field **fields);
 
-  type *dereference ();
+  type *dereference () FINAL OVERRIDE;
 
-  bool is_int () const { return false; }
-  bool is_float () const { return false; }
-  bool is_bool () const { return false; }
-  type *is_pointer () { return NULL; }
-  type *is_array () { return NULL; }
+  bool is_int () const FINAL OVERRIDE { return false; }
+  bool is_float () const FINAL OVERRIDE { return false; }
+  bool is_bool () const FINAL OVERRIDE { return false; }
+  type *is_pointer () FINAL OVERRIDE { return NULL; }
+  type *is_array () FINAL OVERRIDE { return NULL; }
 
-  bool has_known_size () const { return m_fields != NULL; }
+  bool has_known_size () const FINAL OVERRIDE { return m_fields != NULL; }
 
   playback::compound_type *
   playback_compound_type ()
@@ -824,18 +824,18 @@  public:
 	   location *loc,
 	   string *name);
 
-  struct_ *dyn_cast_struct () { return this; }
+  struct_ *dyn_cast_struct () FINAL OVERRIDE { return this; }
 
   type *
   as_type () { return this; }
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  const char *access_as_type (reproducer &r);
+  const char *access_as_type (reproducer &r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 };
 
 // memento of struct_::set_fields
@@ -846,16 +846,16 @@  public:
 	  int num_fields,
 	  field **fields);
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
   int length () const { return m_fields.length (); }
   field *get_field (int i) const { return m_fields[i]; }
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   compound_type *m_struct_or_union;
@@ -869,11 +869,11 @@  public:
 	  location *loc,
 	  string *name);
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   location *m_loc;
@@ -1009,7 +1009,7 @@  public:
   rvalue *
   as_rvalue () { return this; }
 
-  const char *access_as_rvalue (reproducer &r);
+  const char *access_as_rvalue (reproducer &r) OVERRIDE;
   virtual const char *access_as_lvalue (reproducer &r);
 };
 
@@ -1026,9 +1026,9 @@  public:
   lvalue *
   as_lvalue () { return this; }
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *) {}
+  void visit_children (rvalue_visitor *) FINAL OVERRIDE {}
 
   playback::param *
   playback_param () const
@@ -1036,15 +1036,18 @@  public:
     return static_cast <playback::param *> (m_playback_obj);
   }
 
-  param *dyn_cast_param () { return this; }
+  param *dyn_cast_param () FINAL OVERRIDE { return this; }
 
-  const char *access_as_rvalue (reproducer &r);
-  const char *access_as_lvalue (reproducer &r);
+  const char *access_as_rvalue (reproducer &r) FINAL OVERRIDE;
+  const char *access_as_lvalue (reproducer &r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string () { return m_name; }
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_PRIMARY; }
+  string * make_debug_string () FINAL OVERRIDE { return m_name; }
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_PRIMARY;
+  }
 
 private:
   string *m_name;
@@ -1063,7 +1066,7 @@  public:
 	    int is_variadic,
 	    enum built_in_function builtin_id);
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
   playback::function *
   playback_function () const
@@ -1093,15 +1096,15 @@  public:
 
   bool is_variadic () const { return m_is_variadic; }
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
   void validate ();
 
   void dump_to_dot (const char *path);
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   location *m_loc;
@@ -1183,7 +1186,7 @@  public:
     return static_cast <playback::block *> (m_playback_obj);
   }
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
   bool validate ();
 
@@ -1195,10 +1198,10 @@  public:
   vec <block *> get_successor_blocks () const;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
   void dump_to_dot (pretty_printer *pp);
   void dump_edges_to_dot (pretty_printer *pp);
@@ -1227,16 +1230,19 @@  public:
     m_name (name)
   {}
 
-  void replay_into (replayer *);
+  void replay_into (replayer *) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *) {}
+  void visit_children (rvalue_visitor *) FINAL OVERRIDE {}
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string () { return m_name; }
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_PRIMARY; }
+  string * make_debug_string () FINAL OVERRIDE { return m_name; }
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_PRIMARY;
+  }
 
 private:
   enum gcc_jit_global_kind m_kind;
@@ -1254,18 +1260,21 @@  public:
   : rvalue (ctxt, loc, type),
     m_value (value) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *) {}
+  void visit_children (rvalue_visitor *) FINAL OVERRIDE {}
 
-  bool is_constant () const { return true; }
+  bool is_constant () const FINAL OVERRIDE { return true; }
 
-  bool get_wide_int (wide_int *out) const;
+  bool get_wide_int (wide_int *out) const FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_PRIMARY; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_PRIMARY;
+  }
 
 private:
   HOST_TYPE m_value;
@@ -1280,14 +1289,17 @@  public:
   : rvalue (ctxt, loc, ctxt->get_type (GCC_JIT_TYPE_CONST_CHAR_PTR)),
     m_value (value) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *) {}
+  void visit_children (rvalue_visitor *) FINAL OVERRIDE {}
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_PRIMARY; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_PRIMARY;
+  }
 
 private:
   string *m_value;
@@ -1306,14 +1318,17 @@  public:
     m_a (a)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const {return PRECEDENCE_UNARY;}
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_UNARY;
+  }
 
 private:
   enum gcc_jit_unary_op m_op;
@@ -1333,14 +1348,14 @@  public:
     m_a (a),
     m_b (b) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const;
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE;
 
 private:
   enum gcc_jit_binary_op m_op;
@@ -1361,14 +1376,14 @@  public:
     m_b (b)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const;
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE;
 
 private:
   enum gcc_jit_comparison m_op;
@@ -1387,14 +1402,17 @@  public:
     m_rvalue (a)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_CAST; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_CAST;
+  }
 
 private:
   rvalue *m_rvalue;
@@ -1409,14 +1427,17 @@  public:
 	int numargs,
 	rvalue **args);
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_POSTFIX; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_POSTFIX;
+  }
 
 private:
   function *m_func;
@@ -1432,14 +1453,17 @@  public:
 		    int numargs,
 		    rvalue **args);
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_POSTFIX; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_POSTFIX;
+  }
 
 private:
   rvalue *m_fn_ptr;
@@ -1458,14 +1482,17 @@  public:
     m_index (index)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_POSTFIX; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_POSTFIX;
+  }
 
 private:
   rvalue *m_ptr;
@@ -1484,14 +1511,17 @@  public:
     m_field (field)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_POSTFIX; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_POSTFIX;
+  }
 
 private:
   lvalue *m_lvalue;
@@ -1510,14 +1540,17 @@  public:
     m_field (field)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_POSTFIX; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_POSTFIX;
+  }
 
 private:
   rvalue *m_rvalue;
@@ -1536,14 +1569,17 @@  public:
     m_field (field)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_POSTFIX; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_POSTFIX;
+  }
 
 private:
   rvalue *m_rvalue;
@@ -1559,14 +1595,17 @@  public:
   : lvalue (ctxt, loc, val->get_type ()->dereference ()),
     m_rvalue (val) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_UNARY; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_UNARY;
+  }
 
 private:
   rvalue *m_rvalue;
@@ -1582,14 +1621,17 @@  public:
     m_lvalue (val)
   {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *v);
+  void visit_children (rvalue_visitor *v) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_UNARY; }
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_UNARY;
+  }
 
 private:
   lvalue *m_lvalue;
@@ -1606,16 +1648,19 @@  public:
     set_scope (func);
   }
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  void visit_children (rvalue_visitor *) {}
+  void visit_children (rvalue_visitor *) FINAL OVERRIDE {}
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string () { return m_name; }
-  void write_reproducer (reproducer &r);
-  enum precedence get_precedence () const { return PRECEDENCE_PRIMARY; }
+  string * make_debug_string () FINAL OVERRIDE { return m_name; }
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
+  enum precedence get_precedence () const FINAL OVERRIDE
+  {
+    return PRECEDENCE_PRIMARY;
+  }
 
 private:
   function *m_func;
@@ -1627,7 +1672,7 @@  class statement : public memento
 public:
   virtual vec <block *> get_successor_blocks () const;
 
-  void write_to_dump (dump &d);
+  void write_to_dump (dump &d) FINAL OVERRIDE;
 
   block *get_block () const { return m_block; }
   location *get_loc () const { return m_loc; }
@@ -1658,11 +1703,11 @@  public:
   : statement (b, loc),
     m_rvalue (rvalue) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   rvalue *m_rvalue;
@@ -1679,11 +1724,11 @@  public:
     m_lvalue (lvalue),
     m_rvalue (rvalue) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   lvalue *m_lvalue;
@@ -1703,11 +1748,11 @@  public:
     m_op (op),
     m_rvalue (rvalue) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   lvalue *m_lvalue;
@@ -1724,11 +1769,11 @@  public:
   : statement (b, loc),
     m_text (text) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   string *m_text;
@@ -1747,13 +1792,13 @@  public:
     m_on_true (on_true),
     m_on_false (on_false) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  vec <block *> get_successor_blocks () const;
+  vec <block *> get_successor_blocks () const FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   rvalue *m_boolval;
@@ -1770,13 +1815,13 @@  public:
   : statement (b, loc),
     m_target (target) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  vec <block *> get_successor_blocks () const;
+  vec <block *> get_successor_blocks () const FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   block *m_target;
@@ -1791,13 +1836,13 @@  public:
   : statement (b, loc),
     m_rvalue (rvalue) {}
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  vec <block *> get_successor_blocks () const;
+  vec <block *> get_successor_blocks () const FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   rvalue *m_rvalue;
@@ -1820,12 +1865,12 @@  class case_ : public memento
   rvalue *get_max_value () const { return m_max_value; }
   block *get_dest_block () const { return m_dest_block; }
 
-  void replay_into (replayer *) { /* empty */ }
+  void replay_into (replayer *) FINAL OVERRIDE { /* empty */ }
 
-  void write_reproducer (reproducer &r);
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
+  string * make_debug_string () FINAL OVERRIDE;
 
  private:
   rvalue *m_min_value;
@@ -1843,13 +1888,13 @@  public:
 	   int num_cases,
 	   case_ **cases);
 
-  void replay_into (replayer *r);
+  void replay_into (replayer *r) FINAL OVERRIDE;
 
-  vec <block *> get_successor_blocks () const;
+  vec <block *> get_successor_blocks () const FINAL OVERRIDE;
 
 private:
-  string * make_debug_string ();
-  void write_reproducer (reproducer &r);
+  string * make_debug_string () FINAL OVERRIDE;
+  void write_reproducer (reproducer &r) FINAL OVERRIDE;
 
 private:
   rvalue *m_expr;