Clang produces -Winconsistent-missing-override for some member functions
in Ranger. This patch adds the override keyword for those functions.
This has no effect on functionality.
Pushed as obvious.
gcc/ChangeLog:
* gimple-range-cache.h: Add some missing override keywords for
member functions.
* gimple-range-path.h: Ditto.
* gimple-range.h: Ditto.
* range-op.cc: Ditto.
* value-relation.h: Exchange the virtual keyword for the
override keyword where appropriate.
Signed-off-by: Filip Kastl <[email protected]>
---
gcc/gimple-range-cache.h | 2 +-
gcc/gimple-range-path.h | 2 +-
gcc/gimple-range.h | 2 +-
gcc/range-op.cc | 9 +++++----
gcc/value-relation.h | 6 +++---
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/gcc/gimple-range-cache.h b/gcc/gimple-range-cache.h
index 8a4185fc3e3..450ef5375cd 100644
--- a/gcc/gimple-range-cache.h
+++ b/gcc/gimple-range-cache.h
@@ -121,7 +121,7 @@ public:
void register_inferred_value (const vrange &r, tree name, basic_block bb);
void apply_inferred_ranges (gimple *s);
- void reset_range_info (tree name);
+ void reset_range_info (tree name) override;
void dump_bb (FILE *f, basic_block bb);
virtual void dump (FILE *f) override;
diff --git a/gcc/gimple-range-path.h b/gcc/gimple-range-path.h
index 776227d0fb1..b665b464f0d 100644
--- a/gcc/gimple-range-path.h
+++ b/gcc/gimple-range-path.h
@@ -43,7 +43,7 @@ public:
bool range_of_stmt (vrange &r, gimple *, tree name = NULL) override;
bool unreachable_path_p ();
// Path ranger should not be an active query.
- virtual bool active_query_compatible_p () { return false; }
+ virtual bool active_query_compatible_p () override { return false; }
void dump (FILE *) override;
void debug ();
diff --git a/gcc/gimple-range.h b/gcc/gimple-range.h
index 003fede8334..bee3f63a8e2 100644
--- a/gcc/gimple-range.h
+++ b/gcc/gimple-range.h
@@ -65,7 +65,7 @@ public:
void register_inferred_ranges (gimple *s);
void register_transitive_inferred_ranges (basic_block bb);
range_query &const_query ();
- void reset_range_info (tree name);
+ void reset_range_info (tree name) override;
protected:
bool fold_range_internal (vrange &r, gimple *s, tree name);
struct prefill_frame
diff --git a/gcc/range-op.cc b/gcc/range-op.cc
index 3f302bdc1d1..da788182899 100644
--- a/gcc/range-op.cc
+++ b/gcc/range-op.cc
@@ -4496,16 +4496,17 @@ public:
const wide_int &lh_lb,
const wide_int &lh_ub,
const wide_int &rh_lb,
- const wide_int &rh_ub) const;
+ const wide_int &rh_ub) const override;
virtual bool op1_range (irange &r, tree type,
const irange &lhs,
const irange &op2,
- relation_trio) const;
+ relation_trio) const override;
virtual bool op2_range (irange &r, tree type,
const irange &lhs,
const irange &op1,
- relation_trio) const;
- void update_bitmask (irange &r, const irange &lh, const irange &rh) const
+ relation_trio) const override;
+ void update_bitmask (irange &r, const irange &lh,
+ const irange &rh) const override
{ update_known_bitmask (r, TRUNC_MOD_EXPR, lh, rh); }
bool op1_op2_relation_effect (irange &lhs_range,
tree type,
diff --git a/gcc/value-relation.h b/gcc/value-relation.h
index f8d8d6de08f..ca2c8ef40fd 100644
--- a/gcc/value-relation.h
+++ b/gcc/value-relation.h
@@ -178,7 +178,7 @@ public:
relation_kind query (basic_block, tree, tree) override;
relation_kind query (basic_block, const_bitmap, const_bitmap) override;
- virtual void clear (tree name);
+ void clear (tree name) override;
void dump (FILE *f, basic_block bb) const override;
void dump (FILE *f) const override;
@@ -276,7 +276,7 @@ public:
relation_kind query (basic_block bb, const_bitmap b1, const_bitmap b2)
final override;
- virtual void clear (tree name);
+ void clear (tree name) override;
void dump (FILE *f, basic_block bb) const final override;
void dump (FILE *f) const final override;
@@ -368,7 +368,7 @@ public:
void reset_path (relation_oracle *oracle = NULL);
void set_root_oracle (relation_oracle *oracle) { m_root = oracle; }
- virtual void clear (tree name);
+ void clear (tree name) override;
void dump (FILE *, basic_block) const final override;
void dump (FILE *) const final override;
--
2.55.0
