diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-06-22 16:33:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-12 07:29:44 +0000 |
| commit | 1a1f10806c901bc10483370a932d41af0c9629cd (patch) | |
| tree | 65b5c359e03098fd72aa1b04fe7ca12caf2ec4b8 /src/qml/jit | |
| parent | 92624025eab667e096eb13993fa7ca7c5534e0ff (diff) | |
Access the id objects through a specialized runtime method
This brings us one step closer to getting rid of the
QQmlContextWrapper.
Change-Id: Ied57f4c174c2ebd95096310a4ad4c0c28787e7a4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4isel_masm.cpp | 7 | ||||
| -rw-r--r-- | src/qml/jit/qv4isel_masm_p.h | 1 | ||||
| -rw-r--r-- | src/qml/jit/qv4regalloc.cpp | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index 4bf2753ae4..acead2088b 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -579,11 +579,6 @@ void InstructionSelection::loadQmlContext(IR::Expr *temp) generateFunctionCall(temp, Runtime::getQmlContext, Assembler::EngineRegister); } -void InstructionSelection::loadQmlIdArray(IR::Expr *temp) -{ - generateFunctionCall(temp, Runtime::getQmlIdArray, Assembler::EngineRegister); -} - void InstructionSelection::loadQmlImportedScripts(IR::Expr *temp) { generateFunctionCall(temp, Runtime::getQmlImportedScripts, Assembler::EngineRegister); @@ -681,6 +676,8 @@ void InstructionSelection::getQmlContextProperty(IR::Expr *base, IR::Member::Mem generateFunctionCall(target, Runtime::getQmlScopeObjectProperty, Assembler::EngineRegister, Assembler::PointerToValue(base), Assembler::TrustedImm32(index)); else if (kind == IR::Member::MemberOfQmlContextObject) generateFunctionCall(target, Runtime::getQmlContextObjectProperty, Assembler::EngineRegister, Assembler::PointerToValue(base), Assembler::TrustedImm32(index)); + else if (kind == IR::Member::MemberOfIdObjectsArray) + generateFunctionCall(target, Runtime::getQmlIdObject, Assembler::EngineRegister, Assembler::PointerToValue(base), Assembler::TrustedImm32(index)); else Q_ASSERT(false); } diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h index 61aeb2025f..6e842f5fb4 100644 --- a/src/qml/jit/qv4isel_masm_p.h +++ b/src/qml/jit/qv4isel_masm_p.h @@ -97,7 +97,6 @@ protected: virtual void convertType(IR::Expr *source, IR::Expr *target); virtual void loadThisObject(IR::Expr *temp); virtual void loadQmlContext(IR::Expr *target); - virtual void loadQmlIdArray(IR::Expr *target); virtual void loadQmlImportedScripts(IR::Expr *target); virtual void loadQmlSingleton(const QString &name, IR::Expr *target); virtual void loadConst(IR::Const *sourceConst, IR::Expr *target); diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp index 2d85d2ccc4..b9178c0ea0 100644 --- a/src/qml/jit/qv4regalloc.cpp +++ b/src/qml/jit/qv4regalloc.cpp @@ -437,12 +437,6 @@ protected: // IRDecoder addCall(); } - virtual void loadQmlIdArray(IR::Expr *temp) - { - addDef(temp); - addCall(); - } - virtual void loadQmlImportedScripts(IR::Expr *temp) { addDef(temp); |