2 files changed, 13 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 2ad85ab910..36b7f68de9 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1901,6 +1901,12 @@ QVector<int> JSCodeGen::generateJSCodeForFunctionsAndBindings(const QList<Compil
             scan.enterEnvironment(f.parentNode, QV4::Compiler::ContextType::Binding, qmlName(f));
         }
 
+        /* We do not want to visit the whole function, as we already  called enterQmlFunction
+           However, there might be a function defined as a default argument of the function.
+           That needs to be considered, too, so we call handleTopLevelFunctionFormals to
+           deal with them.
+         */
+        scan.handleTopLevelFunctionFormals(function);
         scan(function ? function->body : f.node);
         scan.leaveEnvironment();
     }
diff --git a/src/qml/compiler/qv4compilerscanfunctions_p.h b/src/qml/compiler/qv4compilerscanfunctions_p.h
index e39aa2454e..56172e2ea5 100644
--- a/src/qml/compiler/qv4compilerscanfunctions_p.h
+++ b/src/qml/compiler/qv4compilerscanfunctions_p.h
@@ -83,6 +83,13 @@ public:
     ScanFunctions(Codegen *cg, const QString &sourceCode, ContextType defaultProgramType);
     void operator()(QQmlJS::AST::Node *node);
 
+    // see comment at its call site in generateJSCodeForFunctionsAndBindings
+    // for why this function is necessary
+    void handleTopLevelFunctionFormals(QQmlJS::AST::FunctionExpression *node) {
+        if (node && node->formals)
+            node->formals->accept(this);
+    }
+
     void enterGlobalEnvironment(ContextType compilationMode);
     void enterEnvironment(QQmlJS::AST::Node *node, ContextType compilationMode,
                           const QString &name);