gcc/ChangeLog:
* diagnostic-path.h: Replace uses of "FINAL" and "OVERRIDE" with
"final" and "override".
* 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 <[email protected]>
---
gcc/diagnostic-path.h | 12 ++++++------
gcc/digraph.cc | 4 ++--
gcc/gcc-rich-location.h | 6 +++---
gcc/gimple-array-bounds.cc | 2 +-
gcc/gimple-loop-versioning.cc | 4 ++--
gcc/gimple-range-cache.cc | 12 ++++++------
gcc/gimple-range-cache.h | 2 +-
gcc/gimple-range-fold.cc | 8 ++++----
gcc/gimple-range-fold.h | 10 +++++-----
gcc/gimple-range-tests.cc | 2 +-
gcc/gimple-range.h | 8 ++++----
gcc/gimple-ssa-evrp.cc | 26 +++++++++++++-------------
gcc/input.cc | 4 ++--
gcc/json.h | 24 ++++++++++++------------
gcc/read-rtl-function.cc | 10 +++++-----
gcc/tree-complex.cc | 4 ++--
gcc/tree-diagnostic-path.cc | 2 +-
gcc/tree-ssa-ccp.cc | 8 ++++----
gcc/tree-ssa-copy.cc | 6 +++---
gcc/tree-vrp.cc | 22 +++++++++++-----------
gcc/value-query.h | 8 ++++----
gcc/vr-values.h | 12 ++++++------
22 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/gcc/diagnostic-path.h b/gcc/diagnostic-path.h
index 3bd89d65a73..6c1190d6f2d 100644
--- a/gcc/diagnostic-path.h
+++ b/gcc/diagnostic-path.h
@@ -106,10 +106,10 @@ class simple_diagnostic_event : public diagnostic_event
const char *desc);
~simple_diagnostic_event ();
- location_t get_location () const FINAL OVERRIDE { return m_loc; }
- tree get_fndecl () const FINAL OVERRIDE { return m_fndecl; }
- int get_stack_depth () const FINAL OVERRIDE { return m_depth; }
- label_text get_desc (bool) const FINAL OVERRIDE
+ location_t get_location () const final override { return m_loc; }
+ tree get_fndecl () const final override { return m_fndecl; }
+ int get_stack_depth () const final override { return m_depth; }
+ label_text get_desc (bool) const final override
{
return label_text::borrow (m_desc);
}
@@ -130,8 +130,8 @@ class simple_diagnostic_path : public diagnostic_path
simple_diagnostic_path (pretty_printer *event_pp)
: m_event_pp (event_pp) {}
- unsigned num_events () const FINAL OVERRIDE;
- const diagnostic_event & get_event (int idx) const FINAL OVERRIDE;
+ unsigned num_events () const final override;
+ const diagnostic_event & get_event (int idx) const final override;
diagnostic_event_id_t add_event (location_t loc, tree fndecl, int depth,
const char *fmt, ...)
diff --git a/gcc/digraph.cc b/gcc/digraph.cc
index 06fd70b89cc..6a1cb1bfe44 100644
--- a/gcc/digraph.cc
+++ b/gcc/digraph.cc
@@ -51,7 +51,7 @@ struct test_graph_traits
struct test_node : public dnode<test_graph_traits>
{
test_node (const char *name, int index) : m_name (name), m_index (index) {}
- void dump_dot (graphviz_out *, const dump_args_t &) const OVERRIDE
+ void dump_dot (graphviz_out *, const dump_args_t &) const override
{
}
@@ -65,7 +65,7 @@ struct test_edge : public dedge<test_graph_traits>
: dedge<test_graph_traits> (src, dest)
{}
- void dump_dot (graphviz_out *gv, const dump_args_t &) const OVERRIDE
+ void dump_dot (graphviz_out *gv, const dump_args_t &) const override
{
gv->println ("%s %s %s%c", m_src->m_name, "->", m_dest->m_name, ';');
}
diff --git a/gcc/gcc-rich-location.h b/gcc/gcc-rich-location.h
index a43fe3899b5..789ce0eed3a 100644
--- a/gcc/gcc-rich-location.h
+++ b/gcc/gcc-rich-location.h
@@ -113,7 +113,7 @@ class text_range_label : public range_label
public:
text_range_label (const char *text) : m_text (text) {}
- label_text get_text (unsigned /*range_idx*/) const FINAL OVERRIDE
+ label_text get_text (unsigned /*range_idx*/) const final override
{
return label_text::borrow (m_text);
}
@@ -159,7 +159,7 @@ class range_label_for_type_mismatch : public range_label
{
}
- label_text get_text (unsigned range_idx) const OVERRIDE;
+ label_text get_text (unsigned range_idx) const override;
protected:
tree m_labelled_type;
@@ -178,7 +178,7 @@ class maybe_range_label_for_tree_type_mismatch : public
range_label
{
}
- label_text get_text (unsigned range_idx) const FINAL OVERRIDE;
+ label_text get_text (unsigned range_idx) const final override;
private:
tree m_expr;
diff --git a/gcc/gimple-array-bounds.cc b/gcc/gimple-array-bounds.cc
index 7ec8b08c8d2..0b48bdb0ae5 100644
--- a/gcc/gimple-array-bounds.cc
+++ b/gcc/gimple-array-bounds.cc
@@ -761,7 +761,7 @@ public:
checker (checker) { }
~check_array_bounds_dom_walker () {}
- edge before_dom_children (basic_block) FINAL OVERRIDE;
+ edge before_dom_children (basic_block) final override;
private:
array_bounds_checker *checker;
diff --git a/gcc/gimple-loop-versioning.cc b/gcc/gimple-loop-versioning.cc
index 5838ce733eb..ab02bdd4b15 100644
--- a/gcc/gimple-loop-versioning.cc
+++ b/gcc/gimple-loop-versioning.cc
@@ -258,7 +258,7 @@ private:
public:
lv_dom_walker (loop_versioning &);
- edge before_dom_children (basic_block) FINAL OVERRIDE;
+ edge before_dom_children (basic_block) final override;
private:
/* The parent pass. */
@@ -271,7 +271,7 @@ private:
{
public:
name_prop (loop_info &li) : m_li (li) {}
- tree value_of_expr (tree name, gimple *) FINAL OVERRIDE;
+ tree value_of_expr (tree name, gimple *) final override;
private:
/* Information about the versioning we've performed on the loop. */
diff --git a/gcc/gimple-range-cache.cc b/gcc/gimple-range-cache.cc
index 421ea1a20ef..47314dd132c 100644
--- a/gcc/gimple-range-cache.cc
+++ b/gcc/gimple-range-cache.cc
@@ -191,9 +191,9 @@ class sbr_vector : public ssa_block_ranges
public:
sbr_vector (tree t, irange_allocator *allocator);
- virtual bool set_bb_range (const_basic_block bb, const irange &r) OVERRIDE;
- virtual bool get_bb_range (irange &r, const_basic_block bb) OVERRIDE;
- virtual bool bb_range_p (const_basic_block bb) OVERRIDE;
+ virtual bool set_bb_range (const_basic_block bb, const irange &r) override;
+ virtual bool get_bb_range (irange &r, const_basic_block bb) override;
+ virtual bool bb_range_p (const_basic_block bb) override;
protected:
irange **m_tab; // Non growing vector.
int m_tab_size;
@@ -306,9 +306,9 @@ class sbr_sparse_bitmap : public ssa_block_ranges
{
public:
sbr_sparse_bitmap (tree t, irange_allocator *allocator, bitmap_obstack *bm);
- virtual bool set_bb_range (const_basic_block bb, const irange &r) OVERRIDE;
- virtual bool get_bb_range (irange &r, const_basic_block bb) OVERRIDE;
- virtual bool bb_range_p (const_basic_block bb) OVERRIDE;
+ virtual bool set_bb_range (const_basic_block bb, const irange &r) override;
+ virtual bool get_bb_range (irange &r, const_basic_block bb) override;
+ virtual bool bb_range_p (const_basic_block bb) override;
private:
void bitmap_set_quad (bitmap head, int quad, int quad_value);
int bitmap_get_quad (const_bitmap head, int quad);
diff --git a/gcc/gimple-range-cache.h b/gcc/gimple-range-cache.h
index a0244e4f6a4..f4e24561f79 100644
--- a/gcc/gimple-range-cache.h
+++ b/gcc/gimple-range-cache.h
@@ -143,7 +143,7 @@ public:
gori_compute m_gori;
void dump_bb (FILE *f, basic_block bb);
- virtual void dump (FILE *f) OVERRIDE;
+ virtual void dump (FILE *f) override;
private:
ssa_global_cache m_globals;
block_range_cache m_on_entry;
diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
index 3169e29b5de..e53ba5f85ef 100644
--- a/gcc/gimple-range-fold.cc
+++ b/gcc/gimple-range-fold.cc
@@ -108,8 +108,8 @@ class fur_edge : public fur_source
{
public:
fur_edge (edge e, range_query *q = NULL);
- virtual bool get_operand (irange &r, tree expr) OVERRIDE;
- virtual bool get_phi_operand (irange &r, tree expr, edge e) OVERRIDE;
+ virtual bool get_operand (irange &r, tree expr) override;
+ virtual bool get_phi_operand (irange &r, tree expr, edge e) override;
private:
edge m_edge;
};
@@ -216,8 +216,8 @@ public:
fur_list (irange &r1);
fur_list (irange &r1, irange &r2);
fur_list (unsigned num, irange *list);
- virtual bool get_operand (irange &r, tree expr) OVERRIDE;
- virtual bool get_phi_operand (irange &r, tree expr, edge e) OVERRIDE;
+ virtual bool get_operand (irange &r, tree expr) override;
+ virtual bool get_phi_operand (irange &r, tree expr, edge e) override;
private:
int_range_max m_local[2];
irange *m_list;
diff --git a/gcc/gimple-range-fold.h b/gcc/gimple-range-fold.h
index 4fe8d064a47..53a5bf85dd4 100644
--- a/gcc/gimple-range-fold.h
+++ b/gcc/gimple-range-fold.h
@@ -143,9 +143,9 @@ class fur_stmt : public fur_source
{
public:
fur_stmt (gimple *s, range_query *q = NULL);
- virtual bool get_operand (irange &r, tree expr) OVERRIDE;
- virtual bool get_phi_operand (irange &r, tree expr, edge e) OVERRIDE;
- virtual relation_kind query_relation (tree op1, tree op2) OVERRIDE;
+ virtual bool get_operand (irange &r, tree expr) override;
+ virtual bool get_phi_operand (irange &r, tree expr, edge e) override;
+ virtual relation_kind query_relation (tree op1, tree op2) override;
private:
gimple *m_stmt;
};
@@ -158,9 +158,9 @@ class fur_depend : public fur_stmt
public:
fur_depend (gimple *s, gori_compute *gori, range_query *q = NULL);
virtual void register_relation (gimple *stmt, relation_kind k, tree op1,
- tree op2) OVERRIDE;
+ tree op2) override;
virtual void register_relation (edge e, relation_kind k, tree op1,
- tree op2) OVERRIDE;
+ tree op2) override;
protected:
relation_oracle *m_oracle;
};
diff --git a/gcc/gimple-range-tests.cc b/gcc/gimple-range-tests.cc
index fae888d3abf..572acd33d7f 100644
--- a/gcc/gimple-range-tests.cc
+++ b/gcc/gimple-range-tests.cc
@@ -42,7 +42,7 @@ public:
ASSERT_TRUE (r == expect);
}
- virtual bool range_of_expr (irange &r, tree expr, gimple * = NULL) OVERRIDE
+ virtual bool range_of_expr (irange &r, tree expr, gimple * = NULL) override
{
if (expr == op0)
{
diff --git a/gcc/gimple-range.h b/gcc/gimple-range.h
index 0733a534853..94bc3cd3656 100644
--- a/gcc/gimple-range.h
+++ b/gcc/gimple-range.h
@@ -48,14 +48,14 @@ class gimple_ranger : public range_query
public:
gimple_ranger ();
~gimple_ranger ();
- virtual bool range_of_stmt (irange &r, gimple *, tree name = NULL) OVERRIDE;
- virtual bool range_of_expr (irange &r, tree name, gimple * = NULL) OVERRIDE;
- virtual bool range_on_edge (irange &r, edge e, tree name) OVERRIDE;
+ virtual bool range_of_stmt (irange &r, gimple *, tree name = NULL) override;
+ virtual bool range_of_expr (irange &r, tree name, gimple * = NULL) override;
+ virtual bool range_on_edge (irange &r, edge e, tree name) override;
void range_on_entry (irange &r, basic_block bb, tree name);
void range_on_exit (irange &r, basic_block bb, tree name);
void export_global_ranges ();
inline gori_compute &gori () { return m_cache.m_gori; }
- virtual void dump (FILE *f) OVERRIDE;
+ virtual void dump (FILE *f) override;
void debug ();
void dump_bb (FILE *f, basic_block bb);
auto_edge_flag non_executable_edge_flag;
diff --git a/gcc/gimple-ssa-evrp.cc b/gcc/gimple-ssa-evrp.cc
index 2baaed6d978..e7001f7b3d7 100644
--- a/gcc/gimple-ssa-evrp.cc
+++ b/gcc/gimple-ssa-evrp.cc
@@ -68,19 +68,19 @@ public:
}
}
- tree value_of_expr (tree name, gimple *stmt) OVERRIDE
+ tree value_of_expr (tree name, gimple *stmt) override
{
return m_range_analyzer.value_of_expr (name, stmt);
}
- void pre_fold_bb (basic_block bb) OVERRIDE
+ void pre_fold_bb (basic_block bb) override
{
if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "evrp visiting BB%d\n", bb->index);
m_range_analyzer.enter (bb);
}
- void pre_fold_stmt (gimple *stmt) OVERRIDE
+ void pre_fold_stmt (gimple *stmt) override
{
if (dump_file && (dump_flags & TDF_DETAILS))
{
@@ -90,17 +90,17 @@ public:
m_range_analyzer.record_ranges_from_stmt (stmt, false);
}
- bool fold_stmt (gimple_stmt_iterator *gsi) OVERRIDE
+ bool fold_stmt (gimple_stmt_iterator *gsi) override
{
return simplifier.simplify (gsi);
}
- void post_fold_bb (basic_block bb) OVERRIDE
+ void post_fold_bb (basic_block bb) override
{
m_range_analyzer.leave (bb);
}
- void post_new_stmt (gimple *stmt) OVERRIDE
+ void post_new_stmt (gimple *stmt) override
{
m_range_analyzer.set_defs_to_varying (stmt);
}
@@ -157,7 +157,7 @@ public:
delete m_pta;
}
- bool fold_stmt (gimple_stmt_iterator *gsi) OVERRIDE
+ bool fold_stmt (gimple_stmt_iterator *gsi) override
{
simplifier.set_range_query (first, first_exec_flag);
if (simplifier.simplify (gsi))
@@ -173,27 +173,27 @@ public:
return false;
}
- void pre_fold_stmt (gimple *stmt) OVERRIDE
+ void pre_fold_stmt (gimple *stmt) override
{
evrp_folder::pre_fold_stmt (stmt);
m_pta->visit_stmt (stmt);
}
- void pre_fold_bb (basic_block bb) OVERRIDE
+ void pre_fold_bb (basic_block bb) override
{
evrp_folder::pre_fold_bb (bb);
m_pta->enter (bb);
}
- void post_fold_bb (basic_block bb) OVERRIDE
+ void post_fold_bb (basic_block bb) override
{
evrp_folder::post_fold_bb (bb);
m_pta->leave (bb);
}
- tree value_of_expr (tree name, gimple *) OVERRIDE;
- tree value_on_edge (edge, tree name) OVERRIDE;
- tree value_of_stmt (gimple *, tree name) OVERRIDE;
+ tree value_of_expr (tree name, gimple *) override;
+ tree value_on_edge (edge, tree name) override;
+ tree value_of_stmt (gimple *, tree name) override;
private:
DISABLE_COPY_AND_ASSIGN (hybrid_folder);
diff --git a/gcc/input.cc b/gcc/input.cc
index b3970613d81..3c170d39309 100644
--- a/gcc/input.cc
+++ b/gcc/input.cc
@@ -2310,7 +2310,7 @@ class ebcdic_execution_charset : public lexer_test_options
s_singleton = NULL;
}
- void apply (lexer_test &test) FINAL OVERRIDE
+ void apply (lexer_test &test) final override
{
cpp_options *cpp_opts = cpp_get_options (test.m_parser);
cpp_opts->narrow_charset = "IBM1047";
@@ -2375,7 +2375,7 @@ class lexer_diagnostic_sink : public lexer_test_options
free (str);
}
- void apply (lexer_test &test) FINAL OVERRIDE
+ void apply (lexer_test &test) final override
{
cpp_callbacks *callbacks = cpp_get_callbacks (test.m_parser);
callbacks->diagnostic = on_diagnostic;
diff --git a/gcc/json.h b/gcc/json.h
index 9ab6a5b3e7d..f272981259b 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;
diff --git a/gcc/read-rtl-function.cc b/gcc/read-rtl-function.cc
index 49c88804a2a..eacbe4c1200 100644
--- a/gcc/read-rtl-function.cc
+++ b/gcc/read-rtl-function.cc
@@ -77,13 +77,13 @@ class function_reader : public rtx_reader
~function_reader ();
/* Overridden vfuncs of class md_reader. */
- void handle_unknown_directive (file_location, const char *) FINAL OVERRIDE;
+ void handle_unknown_directive (file_location, const char *) final override;
/* Overridden vfuncs of class rtx_reader. */
- rtx read_rtx_operand (rtx x, int idx) FINAL OVERRIDE;
- void handle_any_trailing_information (rtx x) FINAL OVERRIDE;
- rtx postprocess (rtx) FINAL OVERRIDE;
- const char *finalize_string (char *stringbuf) FINAL OVERRIDE;
+ rtx read_rtx_operand (rtx x, int idx) final override;
+ void handle_any_trailing_information (rtx x) final override;
+ rtx postprocess (rtx) final override;
+ const char *finalize_string (char *stringbuf) final override;
rtx_insn **get_insn_by_uid (int uid);
tree parse_mem_expr (const char *desc);
diff --git a/gcc/tree-complex.cc b/gcc/tree-complex.cc
index 42db96a132b..f722057bfec 100644
--- a/gcc/tree-complex.cc
+++ b/gcc/tree-complex.cc
@@ -64,8 +64,8 @@ typedef int complex_lattice_t;
class complex_propagate : public ssa_propagation_engine
{
- enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) FINAL OVERRIDE;
- enum ssa_prop_result visit_phi (gphi *) FINAL OVERRIDE;
+ enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) final override;
+ enum ssa_prop_result visit_phi (gphi *) final override;
};
static vec<complex_lattice_t> complex_lattice_values;
diff --git a/gcc/tree-diagnostic-path.cc b/gcc/tree-diagnostic-path.cc
index ea16bfae79c..4aa694448c5 100644
--- a/gcc/tree-diagnostic-path.cc
+++ b/gcc/tree-diagnostic-path.cc
@@ -51,7 +51,7 @@ class path_label : public range_label
: m_path (path), m_start_idx (start_idx)
{}
- label_text get_text (unsigned range_idx) const FINAL OVERRIDE
+ label_text get_text (unsigned range_idx) const final override
{
unsigned event_idx = m_start_idx + range_idx;
const diagnostic_event &event = m_path->get_event (event_idx);
diff --git a/gcc/tree-ssa-ccp.cc b/gcc/tree-ssa-ccp.cc
index 9164efe3037..7e522f878bd 100644
--- a/gcc/tree-ssa-ccp.cc
+++ b/gcc/tree-ssa-ccp.cc
@@ -180,8 +180,8 @@ public:
class ccp_propagate : public ssa_propagation_engine
{
public:
- enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) FINAL OVERRIDE;
- enum ssa_prop_result visit_phi (gphi *) FINAL OVERRIDE;
+ enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) final override;
+ enum ssa_prop_result visit_phi (gphi *) final override;
};
/* Array of propagated constant values. After propagation,
@@ -947,8 +947,8 @@ do_dbg_cnt (void)
class ccp_folder : public substitute_and_fold_engine
{
public:
- tree value_of_expr (tree, gimple *) FINAL OVERRIDE;
- bool fold_stmt (gimple_stmt_iterator *) FINAL OVERRIDE;
+ tree value_of_expr (tree, gimple *) final override;
+ bool fold_stmt (gimple_stmt_iterator *) final override;
};
/* This method just wraps GET_CONSTANT_VALUE for now. Over time
diff --git a/gcc/tree-ssa-copy.cc b/gcc/tree-ssa-copy.cc
index 7d636ecd438..050a6d11434 100644
--- a/gcc/tree-ssa-copy.cc
+++ b/gcc/tree-ssa-copy.cc
@@ -71,8 +71,8 @@ struct prop_value_t {
class copy_prop : public ssa_propagation_engine
{
public:
- enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) FINAL OVERRIDE;
- enum ssa_prop_result visit_phi (gphi *) FINAL OVERRIDE;
+ enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) final override;
+ enum ssa_prop_result visit_phi (gphi *) final override;
};
static prop_value_t *copy_of;
@@ -492,7 +492,7 @@ init_copy_prop (void)
class copy_folder : public substitute_and_fold_engine
{
public:
- tree value_of_expr (tree name, gimple *) FINAL OVERRIDE;
+ tree value_of_expr (tree name, gimple *) final override;
};
/* Callback for substitute_and_fold to get at the final copy-of values. */
diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc
index 0cbd9d369ca..be7afc3bf74 100644
--- a/gcc/tree-vrp.cc
+++ b/gcc/tree-vrp.cc
@@ -3795,8 +3795,8 @@ public:
void finalize ();
private:
- enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) FINAL OVERRIDE;
- enum ssa_prop_result visit_phi (gphi *) FINAL OVERRIDE;
+ enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) final override;
+ enum ssa_prop_result visit_phi (gphi *) final override;
struct function *fun;
vr_values *m_vr_values;
@@ -4036,11 +4036,11 @@ class vrp_folder : public substitute_and_fold_engine
void simplify_casted_conds (function *fun);
private:
- tree value_of_expr (tree name, gimple *stmt) OVERRIDE
+ tree value_of_expr (tree name, gimple *stmt) override
{
return m_vr_values->value_of_expr (name, stmt);
}
- bool fold_stmt (gimple_stmt_iterator *) FINAL OVERRIDE;
+ bool fold_stmt (gimple_stmt_iterator *) final override;
bool fold_predicate_in (gimple_stmt_iterator *);
vr_values *m_vr_values;
@@ -4269,7 +4269,7 @@ public:
delete m_pta;
}
- tree value_of_expr (tree name, gimple *s = NULL) OVERRIDE
+ tree value_of_expr (tree name, gimple *s = NULL) override
{
// Shortcircuit subst_and_fold callbacks for abnormal ssa_names.
if (TREE_CODE (name) == SSA_NAME && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name))
@@ -4280,7 +4280,7 @@ public:
return ret;
}
- tree value_on_edge (edge e, tree name) OVERRIDE
+ tree value_on_edge (edge e, tree name) override
{
// Shortcircuit subst_and_fold callbacks for abnormal ssa_names.
if (TREE_CODE (name) == SSA_NAME && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name))
@@ -4291,7 +4291,7 @@ public:
return ret;
}
- tree value_of_stmt (gimple *s, tree name = NULL) OVERRIDE
+ tree value_of_stmt (gimple *s, tree name = NULL) override
{
// Shortcircuit subst_and_fold callbacks for abnormal ssa_names.
if (TREE_CODE (name) == SSA_NAME && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name))
@@ -4299,22 +4299,22 @@ public:
return m_ranger->value_of_stmt (s, name);
}
- void pre_fold_bb (basic_block bb) OVERRIDE
+ void pre_fold_bb (basic_block bb) override
{
m_pta->enter (bb);
}
- void post_fold_bb (basic_block bb) OVERRIDE
+ void post_fold_bb (basic_block bb) override
{
m_pta->leave (bb);
}
- void pre_fold_stmt (gimple *stmt) OVERRIDE
+ void pre_fold_stmt (gimple *stmt) override
{
m_pta->visit_stmt (stmt);
}
- bool fold_stmt (gimple_stmt_iterator *gsi) OVERRIDE
+ bool fold_stmt (gimple_stmt_iterator *gsi) override
{
bool ret = m_simplifier.simplify (gsi);
if (!ret)
diff --git a/gcc/value-query.h b/gcc/value-query.h
index 78e2d1b81fa..cf1a1d74de3 100644
--- a/gcc/value-query.h
+++ b/gcc/value-query.h
@@ -79,9 +79,9 @@ public:
range_query ();
virtual ~range_query ();
- virtual tree value_of_expr (tree expr, gimple * = NULL) OVERRIDE;
- virtual tree value_on_edge (edge, tree expr) OVERRIDE;
- virtual tree value_of_stmt (gimple *, tree name = NULL) OVERRIDE;
+ virtual tree value_of_expr (tree expr, gimple * = NULL) override;
+ virtual tree value_on_edge (edge, tree expr) override;
+ virtual tree value_of_stmt (gimple *, tree name = NULL) override;
// These are the range equivalents of the value_* methods. Instead
// of returning a singleton, they calculate a range and return it in
@@ -123,7 +123,7 @@ private:
class global_range_query : public range_query
{
public:
- bool range_of_expr (irange &r, tree expr, gimple * = NULL) OVERRIDE;
+ bool range_of_expr (irange &r, tree expr, gimple * = NULL) override;
};
extern global_range_query global_ranges;
diff --git a/gcc/vr-values.h b/gcc/vr-values.h
index f29441747e2..7a377cebd01 100644
--- a/gcc/vr-values.h
+++ b/gcc/vr-values.h
@@ -109,12 +109,12 @@ class vr_values : public range_query
vr_values (void);
~vr_values (void);
- virtual bool range_of_expr (irange &r, tree expr, gimple *stmt) OVERRIDE;
- virtual tree value_of_expr (tree, gimple * = NULL) OVERRIDE;
- virtual tree value_on_edge (edge, tree) OVERRIDE;
- virtual tree value_of_stmt (gimple *, tree = NULL_TREE) OVERRIDE;
+ virtual bool range_of_expr (irange &r, tree expr, gimple *stmt) override;
+ virtual tree value_of_expr (tree, gimple * = NULL) override;
+ virtual tree value_on_edge (edge, tree) override;
+ virtual tree value_of_stmt (gimple *, tree = NULL_TREE) override;
virtual const value_range_equiv *get_value_range (const_tree,
- gimple * = NULL) OVERRIDE;
+ gimple * = NULL) override;
void set_vr_value (tree, value_range_equiv *);
value_range_equiv *swap_vr_value (tree, value_range_equiv *);
@@ -124,7 +124,7 @@ class vr_values : public range_query
tree op_with_constant_singleton_value_range (tree);
void adjust_range_with_scev (value_range_equiv *, class loop *,
gimple *, tree);
- virtual void dump (FILE *) OVERRIDE;
+ virtual void dump (FILE *) override;
void extract_range_for_var_from_comparison_expr (tree, enum tree_code,
tree, tree,
--
2.26.3
