glsl: Use 'using' to be explicit about visitor overloads

Clang has a warning about overloading virtuals that triggers when a
derived class defines a virtual function that's an overload of
function in the base class.  This kind of thing:

  struct chart; // let's pretend this exists
  struct Base
  {
      virtual void* get(char* e);
  };

  struct Derived: public Base {
      virtual void* get(chart* e); // typo, we wanted to override the same function
  };

The solution is to use

  using Base::get;

to be explicit about the intention to reuse the base class virtual.
We hit this a lot with out glsl ir_hierarchical_visitor visitor
pattern, so let's adds some 'using' to calm down the compiler.

See-also: https://stackoverflow.com/questions/18515183/c-overloaded-virtual-function-warning-by-clang)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3686>
This commit is contained in:
Kristian H. Kristensen 2020-02-03 12:43:19 -08:00 committed by Marge Bot
parent 0bc516fceb
commit e3dfa8f4d6
4 changed files with 11 additions and 0 deletions

View File

@ -260,6 +260,8 @@ public:
class array_resize_visitor : public deref_type_updater {
public:
using deref_type_updater::visit;
unsigned num_vertices;
gl_shader_program *prog;
gl_shader_stage stage;
@ -1506,6 +1508,8 @@ move_non_declarations(exec_list *instructions, exec_node *last,
*/
class array_sizing_visitor : public deref_type_updater {
public:
using deref_type_updater::visit;
array_sizing_visitor()
: mem_ctx(ralloc_context(NULL)),
unnamed_interfaces(_mesa_pointer_hash_table_create(NULL))

View File

@ -268,6 +268,8 @@ struct ir_lower_jumps_visitor : public ir_control_flow_visitor {
* contains the jump.
*/
using ir_control_flow_visitor::visit;
bool progress;
struct function_record function;

View File

@ -49,6 +49,9 @@ struct assignment_entry {
class ir_constant_variable_visitor : public ir_hierarchical_visitor {
public:
using ir_hierarchical_visitor::visit;
using ir_hierarchical_visitor::visit_enter;
virtual ir_visitor_status visit_enter(ir_dereference_variable *);
virtual ir_visitor_status visit(ir_variable *);
virtual ir_visitor_status visit_enter(ir_assignment *);

View File

@ -66,6 +66,8 @@ public:
class kill_for_derefs_visitor : public ir_hierarchical_visitor {
public:
using ir_hierarchical_visitor::visit;
kill_for_derefs_visitor(exec_list *assignments)
{
this->assignments = assignments;