From: Kenneth Graunke Date: Wed, 21 Apr 2010 22:14:02 +0000 (-0700) Subject: Remove ir_label since it is no longer used. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32898866886e218fee4dab741ba8dfcef2c2aa5c;p=mesa.git Remove ir_label since it is no longer used. --- diff --git a/ir.cpp b/ir.cpp index ad016ddbce8..1ae7dd6f0e5 100644 --- a/ir.cpp +++ b/ir.cpp @@ -108,12 +108,6 @@ ir_expression::get_num_operands(void) return num_operands[this->operation]; } -ir_label::ir_label(const char *label, ir_function_signature *signature) - : label(label), signature(signature) -{ - /* empty */ -} - ir_constant::ir_constant(const struct glsl_type *type, const void *data) { diff --git a/ir.h b/ir.h index 0d5b2e4d710..fa9a1321e32 100644 --- a/ir.h +++ b/ir.h @@ -183,26 +183,6 @@ public: }; -class ir_label : public ir_instruction { -public: - ir_label(const char *label, ir_function_signature *signature); - - virtual ir_label *as_label() - { - return this; - } - - virtual void accept(ir_visitor *v) - { - v->visit(this); - } - - const char *label; - - ir_function_signature *signature; -}; - - /*@{*/ /** * The representation of a function instance; may be the full definition or diff --git a/ir_constant_expression.cpp b/ir_constant_expression.cpp index e3a0d9eaa11..e5626c53117 100644 --- a/ir_constant_expression.cpp +++ b/ir_constant_expression.cpp @@ -63,7 +63,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_function_signature *); virtual void visit(ir_function *); virtual void visit(ir_expression *); @@ -107,14 +106,6 @@ ir_constant_visitor::visit(ir_variable *ir) } -void -ir_constant_visitor::visit(ir_label *ir) -{ - (void) ir; - value = NULL; -} - - void ir_constant_visitor::visit(ir_function_signature *ir) { diff --git a/ir_constant_folding.cpp b/ir_constant_folding.cpp index 294f2c2409f..1b53440669f 100644 --- a/ir_constant_folding.cpp +++ b/ir_constant_folding.cpp @@ -43,13 +43,6 @@ ir_constant_folding_visitor::visit(ir_variable *ir) } -void -ir_constant_folding_visitor::visit(ir_label *ir) -{ - ir->signature->accept(this); -} - - void ir_constant_folding_visitor::visit(ir_function_signature *ir) { diff --git a/ir_constant_folding.h b/ir_constant_folding.h index 843b3ad0b77..44bdbd01755 100644 --- a/ir_constant_folding.h +++ b/ir_constant_folding.h @@ -47,7 +47,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_function_signature *); virtual void visit(ir_function *); virtual void visit(ir_expression *); diff --git a/ir_expression_flattening.cpp b/ir_expression_flattening.cpp index 5072940d629..28c96a787de 100644 --- a/ir_expression_flattening.cpp +++ b/ir_expression_flattening.cpp @@ -64,7 +64,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_loop *); virtual void visit(ir_loop_jump *); virtual void visit(ir_function_signature *); @@ -101,13 +100,6 @@ ir_expression_flattening_visitor::visit(ir_variable *ir) (void) ir; } - -void -ir_expression_flattening_visitor::visit(ir_label *ir) -{ - ir->signature->accept(this); -} - void ir_expression_flattening_visitor::visit(ir_loop *ir) { diff --git a/ir_function_inlining.cpp b/ir_function_inlining.cpp index 117b460ae5c..c0e77b42730 100644 --- a/ir_function_inlining.cpp +++ b/ir_function_inlining.cpp @@ -92,7 +92,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_loop *); virtual void visit(ir_loop_jump *); virtual void visit(ir_function_signature *); @@ -120,13 +119,6 @@ ir_function_cloning_visitor::visit(ir_variable *ir) this->remap_variable(ir, new_var); } -void -ir_function_cloning_visitor::visit(ir_label *ir) -{ - (void)ir; - this->result = NULL; -} - void ir_function_cloning_visitor::visit(ir_loop *ir) { @@ -452,12 +444,6 @@ ir_function_inlining_visitor::visit(ir_variable *ir) } -void -ir_function_inlining_visitor::visit(ir_label *ir) -{ - ir->signature->accept(this); -} - void ir_function_inlining_visitor::visit(ir_loop *ir) { diff --git a/ir_function_inlining.h b/ir_function_inlining.h index 60c80a6dfbf..0e5123b2970 100644 --- a/ir_function_inlining.h +++ b/ir_function_inlining.h @@ -48,7 +48,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_loop *); virtual void visit(ir_loop_jump *); virtual void visit(ir_function_signature *); diff --git a/ir_if_simplification.cpp b/ir_if_simplification.cpp index bc5663f4734..1e6fd8da8c5 100644 --- a/ir_if_simplification.cpp +++ b/ir_if_simplification.cpp @@ -55,7 +55,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_loop *); virtual void visit(ir_loop_jump *); virtual void visit(ir_function_signature *); @@ -138,12 +137,6 @@ ir_if_simplification_visitor::visit(ir_variable *ir) } -void -ir_if_simplification_visitor::visit(ir_label *ir) -{ - ir->signature->accept(this); -} - void ir_if_simplification_visitor::visit(ir_loop *ir) { diff --git a/ir_print_visitor.cpp b/ir_print_visitor.cpp index 5d98937c9c2..8f917e48b22 100644 --- a/ir_print_visitor.cpp +++ b/ir_print_visitor.cpp @@ -64,15 +64,6 @@ void ir_print_visitor::visit(ir_variable *ir) } -void ir_print_visitor::visit(ir_label *ir) -{ - printf("\n(label %s\n", ir->label); - - ir->signature->accept(this); - printf(")"); -} - - void ir_print_visitor::visit(ir_function_signature *ir) { printf("(signature\n (parameters\n"); diff --git a/ir_print_visitor.h b/ir_print_visitor.h index 82ebbac81f0..b241f92e040 100644 --- a/ir_print_visitor.h +++ b/ir_print_visitor.h @@ -54,7 +54,6 @@ public: */ /*@{*/ virtual void visit(ir_variable *); - virtual void visit(ir_label *); virtual void visit(ir_function_signature *); virtual void visit(ir_function *); virtual void visit(ir_expression *); diff --git a/ir_visitor.h b/ir_visitor.h index 323720e93ed..579eee701d7 100644 --- a/ir_visitor.h +++ b/ir_visitor.h @@ -45,7 +45,6 @@ public: */ /*@{*/ virtual void visit(class ir_variable *) = 0; - virtual void visit(class ir_label *) = 0; virtual void visit(class ir_function_signature *) = 0; virtual void visit(class ir_function *) = 0; virtual void visit(class ir_expression *) = 0;