diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 18:57:07 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-20 18:57:07 +0000 |
| commit | 112d668c0fded8c6ab7bf40fd3800cf43e005f95 (patch) | |
| tree | b23889851a0d8c779bd7f2f3605375f8adc1cb05 /src/qml/jsruntime/qv4vme_moth.cpp | |
| parent | ae805cafde1f327c9252b9d08449a08f052746d4 (diff) | |
| parent | 55a671ea73fbe657f360befa221e2c0c15ed4b0e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/qml/jsruntime/qv4vme_moth.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index 7293630924..5749d0aef3 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -50,6 +50,8 @@ #include <private/qv4math_p.h> #include <private/qv4scopedvalue_p.h> #include <private/qv4lookup_p.h> +#include <private/qv4regexp_p.h> +#include <private/qv4regexpobject_p.h> #include <private/qv4string_p.h> #include <iostream> @@ -457,7 +459,10 @@ QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code) MOTH_BEGIN_INSTR(LoadRegExp) // TRACE(value, "%s", instr.value.toString(context)->toQString().toUtf8().constData()); - VALUE(instr.result) = static_cast<CompiledData::CompilationUnit*>(engine->current->compilationUnit)->runtimeRegularExpressions[instr.regExpId]; + Heap::RegExpObject *ro = engine->newRegExpObject( + static_cast<CompiledData::CompilationUnit*>(engine->current->compilationUnit) + ->runtimeRegularExpressions[instr.regExpId].as<RegExp>()); + VALUE(instr.result) = ro; MOTH_END_INSTR(LoadRegExp) MOTH_BEGIN_INSTR(LoadClosure) |