aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@me.com>2013-06-12 13:30:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-05 12:46:42 +0200
commitdefa077c93ccfd128433715b078294df7609afe6 (patch)
treeace43b3e24233891abb1d7482a057df02360f741 /src
parenta746ca7f07c404fe2b622c26ba36ab2c9132603f (diff)
Rename V4IR::InstructionSelection to V4IR::IRDecoder.
Now it can be used by classes that want to walk the IR but do not generate instructions, without causing confusion. Change-Id: Idb220a1aee3ba2bbcd43bdeecd28946d567c9f3c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/v4/moth/qv4isel_moth_p.h2
-rw-r--r--src/qml/qml/v4/qv4isel_masm_p.h2
-rw-r--r--src/qml/qml/v4/qv4isel_p.cpp8
-rw-r--r--src/qml/qml/v4/qv4isel_p.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qml/v4/moth/qv4isel_moth_p.h b/src/qml/qml/v4/moth/qv4isel_moth_p.h
index cd13f6b999..9c17245f67 100644
--- a/src/qml/qml/v4/moth/qv4isel_moth_p.h
+++ b/src/qml/qml/v4/moth/qv4isel_moth_p.h
@@ -57,7 +57,7 @@ namespace Moth {
class StackSlotAllocator;
class Q_QML_EXPORT InstructionSelection:
- public V4IR::InstructionSelection,
+ public V4IR::IRDecoder,
public EvalInstructionSelection
{
public:
diff --git a/src/qml/qml/v4/qv4isel_masm_p.h b/src/qml/qml/v4/qv4isel_masm_p.h
index bef577a90e..b53b0e5c74 100644
--- a/src/qml/qml/v4/qv4isel_masm_p.h
+++ b/src/qml/qml/v4/qv4isel_masm_p.h
@@ -777,7 +777,7 @@ private:
};
class Q_QML_EXPORT InstructionSelection:
- protected V4IR::InstructionSelection,
+ protected V4IR::IRDecoder,
public EvalInstructionSelection
{
public:
diff --git a/src/qml/qml/v4/qv4isel_p.cpp b/src/qml/qml/v4/qv4isel_p.cpp
index 7fc3afffb0..99c363bd36 100644
--- a/src/qml/qml/v4/qv4isel_p.cpp
+++ b/src/qml/qml/v4/qv4isel_p.cpp
@@ -116,7 +116,7 @@ QV4::Function *EvalInstructionSelection::vmFunction(Function *f) {
return function;
}
-void InstructionSelection::visitMove(V4IR::Move *s)
+void IRDecoder::visitMove(V4IR::Move *s)
{
if (s->op == V4IR::OpInvalid) {
if (V4IR::Name *n = s->target->asName()) {
@@ -241,11 +241,11 @@ void InstructionSelection::visitMove(V4IR::Move *s)
assert(!"TODO");
}
-InstructionSelection::~InstructionSelection()
+IRDecoder::~IRDecoder()
{
}
-void InstructionSelection::visitExp(V4IR::Exp *s)
+void IRDecoder::visitExp(V4IR::Exp *s)
{
if (V4IR::Call *c = s->expr->asCall()) {
// These are calls where the result is ignored.
@@ -268,7 +268,7 @@ void InstructionSelection::visitExp(V4IR::Exp *s)
}
}
-void InstructionSelection::callBuiltin(V4IR::Call *call, V4IR::Temp *result)
+void IRDecoder::callBuiltin(V4IR::Call *call, V4IR::Temp *result)
{
V4IR::Name *baseName = call->base->asName();
assert(baseName != 0);
diff --git a/src/qml/qml/v4/qv4isel_p.h b/src/qml/qml/v4/qv4isel_p.h
index 28ec63cdaa..ca49b4c8b1 100644
--- a/src/qml/qml/v4/qv4isel_p.h
+++ b/src/qml/qml/v4/qv4isel_p.h
@@ -88,10 +88,10 @@ public:
};
namespace V4IR {
-class Q_QML_EXPORT InstructionSelection: protected V4IR::StmtVisitor
+class Q_QML_EXPORT IRDecoder: protected V4IR::StmtVisitor
{
public:
- virtual ~InstructionSelection() = 0;
+ virtual ~IRDecoder() = 0;
virtual void visitPhi(V4IR::Phi *) {}