diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:21:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:29:17 +0200 |
| commit | bbb78a92a910d32b2886af62c218db87325eb6ce (patch) | |
| tree | 0e4b55352bb9f083826d0e80747982823f2894ed /src/qml/compiler/qv4isel_moth_p.h | |
| parent | 4b5a7b15fc6d3650c8e9b7bf619804a0a953eeba (diff) | |
| parent | 8ed38c70fd29680f7981d9d23581d46cf32139d0 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD
Conflicts:
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmltypeloader_p.h
Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1
Diffstat (limited to 'src/qml/compiler/qv4isel_moth_p.h')
| -rw-r--r-- | src/qml/compiler/qv4isel_moth_p.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/qml/compiler/qv4isel_moth_p.h b/src/qml/compiler/qv4isel_moth_p.h index cf7d1f43e9..66cf62858e 100644 --- a/src/qml/compiler/qv4isel_moth_p.h +++ b/src/qml/compiler/qv4isel_moth_p.h @@ -74,7 +74,7 @@ public: InstructionSelection(QV4::ExecutableAllocator *execAllocator, V4IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator); ~InstructionSelection(); - virtual void run(V4IR::Function *function); + virtual void run(int functionIndex); protected: virtual QV4::CompiledData::CompilationUnit *backendCompileStep(); @@ -93,14 +93,6 @@ protected: virtual void callBuiltinDeleteSubscript(V4IR::Temp *base, V4IR::Expr *index, V4IR::Temp *result); virtual void callBuiltinDeleteName(const QString &name, V4IR::Temp *result); virtual void callBuiltinDeleteValue(V4IR::Temp *result); - virtual void callBuiltinPostDecrementMember(V4IR::Temp *base, const QString &name, V4IR::Temp *result); - virtual void callBuiltinPostDecrementSubscript(V4IR::Temp *base, V4IR::Temp *index, V4IR::Temp *result); - virtual void callBuiltinPostDecrementName(const QString &name, V4IR::Temp *result); - virtual void callBuiltinPostDecrementValue(V4IR::Temp *value, V4IR::Temp *result); - virtual void callBuiltinPostIncrementMember(V4IR::Temp *base, const QString &name, V4IR::Temp *result); - virtual void callBuiltinPostIncrementSubscript(V4IR::Temp *base, V4IR::Temp *index, V4IR::Temp *result); - virtual void callBuiltinPostIncrementName(const QString &name, V4IR::Temp *result); - virtual void callBuiltinPostIncrementValue(V4IR::Temp *value, V4IR::Temp *result); virtual void callBuiltinThrow(V4IR::Expr *arg); virtual void callBuiltinFinishTry(); virtual void callBuiltinForeachIteratorObject(V4IR::Temp *arg, V4IR::Temp *result); |