Some fixes when unwinding inside for-of loops

This is not perfect yet, as the two regressions in TestExpectations
show, but it's an improvement over the current situation.

Change-Id: I82c0ef0f69619562037c573bea1026abc53c1ab3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/qml/compiler/qv4compilercontrolflow_p.h b/src/qml/compiler/qv4compilercontrolflow_p.h
index 1ef290ea56..1884b33588 100644
--- a/src/qml/compiler/qv4compilercontrolflow_p.h
+++ b/src/qml/compiler/qv4compilercontrolflow_p.h
@@ -193,27 +193,28 @@ struct ControlFlowLoop : public ControlFlowUnwind
     QString loopLabel;
     BytecodeGenerator::Label *breakLabel = nullptr;
     BytecodeGenerator::Label *continueLabel = nullptr;
-    bool _requiresUnwind;
+    std::function<void()> unwind = nullptr;
 
-    ControlFlowLoop(Codegen *cg, BytecodeGenerator::Label *breakLabel, BytecodeGenerator::Label *continueLabel = nullptr, bool requiresUnwind = false)
-        : ControlFlowUnwind(cg, Loop), loopLabel(ControlFlow::loopLabel()), breakLabel(breakLabel), continueLabel(continueLabel), _requiresUnwind(requiresUnwind)
+    ControlFlowLoop(Codegen *cg, BytecodeGenerator::Label *breakLabel, BytecodeGenerator::Label *continueLabel = nullptr, std::function<void()> unwind = nullptr)
+        : ControlFlowUnwind(cg, Loop), loopLabel(ControlFlow::loopLabel()), breakLabel(breakLabel), continueLabel(continueLabel), unwind(unwind)
     {
-        if (_requiresUnwind) {
+        if (unwind != nullptr) {
             setupUnwindHandler();
             generator()->setUnwindHandler(&unwindLabel);
         }
     }
 
     ~ControlFlowLoop() {
-        if (_requiresUnwind) {
+        if (unwind != nullptr) {
             unwindLabel.link();
             generator()->setUnwindHandler(parentUnwindHandler());
+            unwind();
             emitUnwindHandler();
         }
     }
 
     bool requiresUnwind() override {
-        return _requiresUnwind;
+        return unwind != nullptr;
     }
 
     BytecodeGenerator::Label getUnwindTarget(UnwindType type, const QString &label) override {