Remove ir_label since it is no longer used.

diff --git a/ir.cpp b/ir.cpp
index ad016ddbce84d9ab6395224b890875578b6d5762..1ae7dd6f0e5774bcee94d149374e0874b8c83198 100644 (file)
--- 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 0d5b2e4d710488db0fd5b172fe7ce667d95405be..fa9a1321e3235adaf20bc52ced0bbcc1765282cb 100644 (file)
--- 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 e3a0d9eaa11645837f7cecd2231a7c86cf2429a3..e5626c53117d1db85a05f9fe16247d9fdd99f699 100644 (file)
--- 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 294f2c2409f902174b7a5490ffc18c172ad0e280..1b53440669f6134c7cd20fd07dfa2158d2872bd6 100644 (file)
--- 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 843b3ad0b77b6d7d7e9bba44d0ad6c2e903d585e..44bdbd017558d4185c444ccbda554694bdbd361c 100644 (file)
--- 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 5072940d629d5180c789fea3cae2a597caae6810..28c96a787ded19521a8515fd78ead41a9c2518bb 100644 (file)
--- 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 117b460ae5ca133267288e4a78e313f581b17743..c0e77b427304875ca287a8a4700c3bae3963e9e5 100644 (file)
--- 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 60c80a6dfbf568c9ff911952b3e1c746b8e1bfe0..0e5123b29708d9e64192294feedd83a1ce19e237 100644 (file)
--- 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 bc5663f4734a15b7aad64552ced6dd0bdc5a39e6..1e6fd8da8c53f7bd99bda3173aff17ade6428d34 100644 (file)
--- 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 5d98937c9c2a169e4d821ff3d46267590f22c8eb..8f917e48b228cab023e7fccf16b00f55623bc8e9 100644 (file)
--- 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 82ebbac81f0e70b53c74d24c0efbb49523d77dba..b241f92e04067b7fa9bca9fe34fbbe293e8f4f85 100644 (file)
--- 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 323720e93eda7398aac3a1bc92705e69825a6263..579eee701d75a52bb7da1249e7a9819ef041cc00 100644 (file)
--- 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;