diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-06-22 10:52:28 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-06-22 09:18:15 +0000 |
commit | 4ac85039a2e3cd092ad51ae726e01d1eef46e37a (patch) | |
tree | 21d88ebbe121f76d44da6105ef77a57ca8ac7409 /src | |
parent | 5863a093cc04a37b26471a308de5115014612375 (diff) |
Various compile fixes
Make sure all libs and tests compile again after
the latest changes.
Change-Id: I749d3d2d0109cc97df2ecec93809ea8a1b3014a9
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp | 1 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp | 1 | ||||
-rw-r--r-- | src/qml/compiler/qv4bytecodegenerator_p.h | 2 | ||||
-rw-r--r-- | src/qml/compiler/qv4compilationunit_moth.cpp | 2 | ||||
-rw-r--r-- | src/qml/compiler/qv4isel_moth.cpp | 7 | ||||
-rw-r--r-- | src/qml/jit/qv4isel_masm.cpp | 1 | ||||
-rw-r--r-- | src/qmldevtools/qmldevtools.pro | 10 |
7 files changed, 21 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp index 168a08865c..14954bf380 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp @@ -706,7 +706,6 @@ void QV4DebugServiceImpl::engineAdded(QJSEngine *engine) QV4::ExecutionEngine *ee = QV8Engine::getV4(engine->handle()); if (QQmlDebugConnector *server = QQmlDebugConnector::instance()) { if (ee) { - ee->iselFactory.reset(new QV4::Moth::ISelFactory); QV4Debugger *debugger = new QV4Debugger(ee); if (state() == Enabled) ee->setDebugger(debugger); diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp index d536fd51ed..41ce9ac6dc 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp @@ -731,7 +731,6 @@ void QQmlNativeDebugServiceImpl::engineAboutToBeAdded(QJSEngine *engine) TRACE_PROTOCOL("Adding execution engine" << ee); if (ee) { NativeDebugger *debugger = new NativeDebugger(this, ee); - ee->iselFactory.reset(new QV4::Moth::ISelFactory); if (state() == Enabled) ee->setDebugger(debugger); m_debuggers.append(QPointer<NativeDebugger>(debugger)); diff --git a/src/qml/compiler/qv4bytecodegenerator_p.h b/src/qml/compiler/qv4bytecodegenerator_p.h index 6206086d8e..a9e2bce159 100644 --- a/src/qml/compiler/qv4bytecodegenerator_p.h +++ b/src/qml/compiler/qv4bytecodegenerator_p.h @@ -220,7 +220,7 @@ private: struct JumpData { int instructionIndex; int offset; - int linkedLabel = -1; + int linkedLabel; }; struct I { diff --git a/src/qml/compiler/qv4compilationunit_moth.cpp b/src/qml/compiler/qv4compilationunit_moth.cpp index b0a69a6584..a93f0f3407 100644 --- a/src/qml/compiler/qv4compilationunit_moth.cpp +++ b/src/qml/compiler/qv4compilationunit_moth.cpp @@ -37,8 +37,10 @@ ** ****************************************************************************/ #include "qv4compilationunit_moth_p.h" +#ifndef V4_BOOTSTRAP #include <private/qv4function_p.h> #include <private/qv4vme_moth_p.h> +#endif #include <wtf/StdLibExtras.h> using namespace QV4::Moth; diff --git a/src/qml/compiler/qv4isel_moth.cpp b/src/qml/compiler/qv4isel_moth.cpp index dbb67346d2..d2503af5fc 100644 --- a/src/qml/compiler/qv4isel_moth.cpp +++ b/src/qml/compiler/qv4isel_moth.cpp @@ -1435,3 +1435,10 @@ Param InstructionSelection::getParam(IR::Expr *e) { return Param(); } } + +QQmlRefPointer<CompiledData::CompilationUnit> ISelFactory::createUnitForLoading() +{ + QQmlRefPointer<CompiledData::CompilationUnit> result; + result.adopt(new Moth::CompilationUnit); + return result; +} diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index e1974f5776..4a84d1866f 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -1655,6 +1655,7 @@ template class Q_QML_EXPORT ISelFactory<>; Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture) { + Q_UNUSED(architecture) #if ENABLE(ASSEMBLER) using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>; using ARM64CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARM64, NoOperatingSystemSpecialization>>; diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index a21988b915..b3cc01d2a9 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -18,4 +18,14 @@ include(../qml/compiler/compiler.pri) include(../qml/memory/memory.pri) include(../qml/jit/jit.pri) +HEADERS += \ + $$PWD/../qml/compiler/qv4isel_p.h \ + $$PWD/../qml/compiler/qv4isel_moth_p.h \ + $$PWD/../qml/compiler/qv4ssa_p.h + +SOURCES += \ + $$PWD/../qml/compiler/qv4isel_p.cpp \ + $$PWD/../qml/compiler/qv4isel_moth.cpp \ + $$PWD/../qml/compiler/qv4ssa.cpp + load(qt_module) |