Use "final" and "override" directly, rather than via macros

As of GCC 11 onwards we have required a C++11 compiler, such as GCC 4.8
or later.  On the assumption that any such compiler correctly implements
"final" and "override", this patch updates the source tree to stop using
the FINAL and OVERRIDE macros from ansidecl.h, in favor of simply using
"final" and "override" directly.

libcpp/ChangeLog:
	* lex.cc: Replace uses of "FINAL" and "OVERRIDE" with "final" and
	"override".

gcc/analyzer/ChangeLog:
	* analyzer-pass.cc: Replace uses of "FINAL" and "OVERRIDE" with
	"final" and "override".
	* call-info.h: Likewise.
	* checker-path.h: Likewise.
	* constraint-manager.cc: Likewise.
	* diagnostic-manager.cc: Likewise.
	* engine.cc: Likewise.
	* exploded-graph.h: Likewise.
	* feasible-graph.h: Likewise.
	* pending-diagnostic.h: Likewise.
	* region-model-impl-calls.cc: Likewise.
	* region-model.cc: Likewise.
	* region-model.h: Likewise.
	* region.h: Likewise.
	* sm-file.cc: Likewise.
	* sm-malloc.cc: Likewise.
	* sm-pattern-test.cc: Likewise.
	* sm-sensitive.cc: Likewise.
	* sm-signal.cc: Likewise.
	* sm-taint.cc: Likewise.
	* state-purge.h: Likewise.
	* store.cc: Likewise.
	* store.h: Likewise.
	* supergraph.h: Likewise.
	* svalue.h: Likewise.
	* trimmed-graph.h: Likewise.
	* varargs.cc: Likewise.

gcc/c-family/ChangeLog:
	* c-format.cc: Replace uses of "FINAL" and "OVERRIDE" with "final"
	and "override".
	* c-pretty-print.h: Likewise.

gcc/cp/ChangeLog:
	* cxx-pretty-print.h: Replace uses of "FINAL" and "OVERRIDE" with
	"final" and "override".
	* error.cc: Likewise.

gcc/jit/ChangeLog:
	* jit-playback.h: Replace uses of "FINAL" and "OVERRIDE" with
	"final" and "override".
	* jit-recording.cc: Likewise.
	* jit-recording.h: Likewise.

gcc/ChangeLog:
	* config/aarch64/aarch64-sve-builtins-base.cc: Replace uses of
	"FINAL" and "OVERRIDE" with "final" and "override".
	* config/aarch64/aarch64-sve-builtins-functions.h: Likewise.
	* config/aarch64/aarch64-sve-builtins-shapes.cc: Likewise.
	* config/aarch64/aarch64-sve-builtins-sve2.cc: Likewise.
	* diagnostic-path.h: Likewise.
	* digraph.cc: Likewise.
	* gcc-rich-location.h: Likewise.
	* gimple-array-bounds.cc: Likewise.
	* gimple-loop-versioning.cc: Likewise.
	* gimple-range-cache.cc: Likewise.
	* gimple-range-cache.h: Likewise.
	* gimple-range-fold.cc: Likewise.
	* gimple-range-fold.h: Likewise.
	* gimple-range-tests.cc: Likewise.
	* gimple-range.h: Likewise.
	* gimple-ssa-evrp.cc: Likewise.
	* input.cc: Likewise.
	* json.h: Likewise.
	* read-rtl-function.cc: Likewise.
	* tree-complex.cc: Likewise.
	* tree-diagnostic-path.cc: Likewise.
	* tree-ssa-ccp.cc: Likewise.
	* tree-ssa-copy.cc: Likewise.
	* tree-vrp.cc: Likewise.
	* value-query.h: Likewise.
	* vr-values.h: Likewise.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/gcc/json.h b/gcc/json.h
index 9ab6a5b..f272981 100644
--- a/gcc/json.h
+++ b/gcc/json.h
@@ -90,8 +90,8 @@ class object : public value
  public:
   ~object ();
 
-  enum kind get_kind () const FINAL OVERRIDE { return JSON_OBJECT; }
-  void print (pretty_printer *pp) const FINAL OVERRIDE;
+  enum kind get_kind () const final override { return JSON_OBJECT; }
+  void print (pretty_printer *pp) const final override;
 
   void set (const char *key, value *v);
   value *get (const char *key) const;
@@ -109,8 +109,8 @@ class array : public value
  public:
   ~array ();
 
-  enum kind get_kind () const FINAL OVERRIDE { return JSON_ARRAY; }
-  void print (pretty_printer *pp) const FINAL OVERRIDE;
+  enum kind get_kind () const final override { return JSON_ARRAY; }
+  void print (pretty_printer *pp) const final override;
 
   void append (value *v);
 
@@ -125,8 +125,8 @@ class float_number : public value
  public:
   float_number (double value) : m_value (value) {}
 
-  enum kind get_kind () const FINAL OVERRIDE { return JSON_FLOAT; }
-  void print (pretty_printer *pp) const FINAL OVERRIDE;
+  enum kind get_kind () const final override { return JSON_FLOAT; }
+  void print (pretty_printer *pp) const final override;
 
   double get () const { return m_value; }
 
@@ -141,8 +141,8 @@ class integer_number : public value
  public:
   integer_number (long value) : m_value (value) {}
 
-  enum kind get_kind () const FINAL OVERRIDE { return JSON_INTEGER; }
-  void print (pretty_printer *pp) const FINAL OVERRIDE;
+  enum kind get_kind () const final override { return JSON_INTEGER; }
+  void print (pretty_printer *pp) const final override;
 
   long get () const { return m_value; }
 
@@ -159,8 +159,8 @@ class string : public value
   string (const char *utf8);
   ~string () { free (m_utf8); }
 
-  enum kind get_kind () const FINAL OVERRIDE { return JSON_STRING; }
-  void print (pretty_printer *pp) const FINAL OVERRIDE;
+  enum kind get_kind () const final override { return JSON_STRING; }
+  void print (pretty_printer *pp) const final override;
 
   const char *get_string () const { return m_utf8; }
 
@@ -179,8 +179,8 @@ class literal : public value
   /* Construct literal for a boolean value.  */
   literal (bool value): m_kind (value ? JSON_TRUE : JSON_FALSE) {}
 
-  enum kind get_kind () const FINAL OVERRIDE { return m_kind; }
-  void print (pretty_printer *pp) const FINAL OVERRIDE;
+  enum kind get_kind () const final override { return m_kind; }
+  void print (pretty_printer *pp) const final override;
 
  private:
   enum kind m_kind;