diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-16 01:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-16 01:00:07 +0200 |
| commit | 299bf6fd51218a0912e7a3d9eb4b0043dbaad1f7 (patch) | |
| tree | cd128b58711244ec6fc785a6e33b963642da663e /src/qml/jsruntime | |
| parent | f157da4d57330a10e085a0e475936d4465577c6d (diff) | |
| parent | 53240b099cf801ec51e5facdf159e35a3fef2cd9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I46dde4965e7718eab99306e2876622589cef487f
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index 77dc222df7..29814246db 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -890,12 +890,14 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine, MOTH_END_INSTR(PopContext) MOTH_BEGIN_INSTR(GetIterator) + STORE_IP(); STORE_ACC(); acc = Runtime::method_getIterator(engine, accumulator, iterator); CHECK_EXCEPTION; MOTH_END_INSTR(GetIterator) MOTH_BEGIN_INSTR(IteratorNext) + STORE_IP(); STORE_ACC(); acc = Runtime::method_iteratorNext(engine, accumulator, &STACK_VALUE(value)); STACK_VALUE(done) = acc; @@ -903,12 +905,14 @@ QV4::ReturnedValue VME::interpret(CppStackFrame *frame, ExecutionEngine *engine, MOTH_END_INSTR(IteratorNext) MOTH_BEGIN_INSTR(IteratorClose) + STORE_IP(); STORE_ACC(); acc = Runtime::method_iteratorClose(engine, accumulator, STACK_VALUE(done)); CHECK_EXCEPTION; MOTH_END_INSTR(IteratorClose) MOTH_BEGIN_INSTR(DestructureRestElement) + STORE_IP(); STORE_ACC(); acc = Runtime::method_destructureRestElement(engine, ACC); CHECK_EXCEPTION; |