V4: Change uses of StmtVisitor/ExprVisitor to use new style visitors.

Change-Id: I668c829bf04e0e16ed94db169507cc5290deec50
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 28 insertions, 6 deletions

diff --git a/src/qml/compiler/qv4isel_p.h b/src/qml/compiler/qv4isel_p.h
index 2ee776adf4..61fd11c435 100644
--- a/src/qml/compiler/qv4isel_p.h
+++ b/src/qml/compiler/qv4isel_p.h
@@ -111,17 +111,34 @@ public:
 };
 
 namespace IR {
-class Q_QML_PRIVATE_EXPORT IRDecoder: protected IR::StmtVisitor
+class Q_QML_PRIVATE_EXPORT IRDecoder
 {
 public:
     IRDecoder() : _function(0) {}
     virtual ~IRDecoder() = 0;
 
-    virtual void visitPhi(IR::Phi *) {}
-
-public: // visitor methods for StmtVisitor:
-    virtual void visitMove(IR::Move *s);
-    virtual void visitExp(IR::Exp *s);
+    void visit(Stmt *s)
+    {
+        if (auto e = s->asExp()) {
+            visitExp(e);
+        } else if (auto m = s->asMove()) {
+            visitMove(m);
+        } else if (auto j = s->asJump()) {
+            visitJump(j);
+        } else if (auto c = s->asCJump()) {
+            visitCJump(c);
+        } else if (auto r = s->asRet()) {
+            visitRet(r);
+        } else if (auto p = s->asPhi()) {
+            visitPhi(p);
+        } else {
+            Q_UNREACHABLE();
+        }
+    }
+
+private: // visitor methods for StmtVisitor:
+    void visitMove(IR::Move *s);
+    void visitExp(IR::Exp *s);
 
 public: // to implement by subclasses:
     virtual void callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result) = 0;
@@ -179,6 +196,11 @@ public: // to implement by subclasses:
     virtual void binop(IR::AluOp oper, IR::Expr *leftSource, IR::Expr *rightSource, IR::Expr *target) = 0;
 
 protected:
+    virtual void visitJump(IR::Jump *) = 0;
+    virtual void visitCJump(IR::CJump *) = 0;
+    virtual void visitRet(IR::Ret *) = 0;
+    virtual void visitPhi(IR::Phi *) {}
+
     virtual void callBuiltin(IR::Call *c, IR::Expr *result);
 
     IR::Function *_function; // subclass needs to set