Merge remote-tracking branch 'origin/5.11.0' into 5.11

Change-Id: Id292599780ae47c6f2f3fa2d3bbc542b113bd16b

2 files changed, 17 insertions, 10 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 8ada1d505e..c281275da1 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -2104,9 +2104,14 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
         _context->addLocalVar(QStringLiteral("arguments"), Context::VariableDeclaration, AST::VariableDeclaration::FunctionScope);
 
     bool allVarsEscape = _context->hasWith || _context->hasTry || _context->hasDirectEval;
-    if (_context->compilationMode == QmlBinding // we don't really need this for bindings, but we do for signal handlers, and we don't know if the code is a signal handler or not.
-            || (!_context->canUseSimpleCall() && _context->compilationMode != GlobalCode &&
-                (_context->compilationMode != EvalCode || _context->isStrict))) {
+    bool needsCallContext = false;
+    const QLatin1String exprForOn("expression for on");
+    if (!_context->canUseSimpleCall() && _context->compilationMode != GlobalCode && (_context->compilationMode != EvalCode || _context->isStrict))
+        needsCallContext = true;
+    else if (_context->compilationMode == QmlBinding && name.length() > exprForOn.size() && name.startsWith(exprForOn) && name.at(exprForOn.size()).isUpper())
+        // we don't really need this for bindings, but we do for signal handlers, and we don't know if the code is a signal handler or not.
+        needsCallContext = true;
+    if (needsCallContext) {
         Instruction::CreateCallContext createContext;
         bytecodeGenerator->addInstruction(createContext);
     }
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index dc8ee550d5..83608070ec 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -360,13 +360,15 @@ ReturnedValue FunctionPrototype::method_bind(const FunctionObject *b, const Valu
         BoundFunction *bound = static_cast<BoundFunction *>(target.getPointer());
         Scoped<MemberData> oldArgs(scope, bound->boundArgs());
         boundThis = bound->boundThis();
-        int oldSize = oldArgs->size();
-        boundArgs = MemberData::allocate(scope.engine, oldSize + nArgs);
-        boundArgs->d()->values.size = oldSize + nArgs;
-        for (uint i = 0; i < static_cast<uint>(oldSize); ++i)
-            boundArgs->set(scope.engine, i, oldArgs->data()[i]);
-        for (uint i = 0; i < static_cast<uint>(nArgs); ++i)
-            boundArgs->set(scope.engine, oldSize + i, argv[i + 1]);
+        int oldSize = !oldArgs ? 0 : oldArgs->size();
+        if (oldSize + nArgs) {
+            boundArgs = MemberData::allocate(scope.engine, oldSize + nArgs);
+            boundArgs->d()->values.size = oldSize + nArgs;
+            for (uint i = 0; i < static_cast<uint>(oldSize); ++i)
+                boundArgs->set(scope.engine, i, oldArgs->data()[i]);
+            for (uint i = 0; i < static_cast<uint>(nArgs); ++i)
+                boundArgs->set(scope.engine, oldSize + i, argv[i + 1]);
+        }
         target = bound->target();
     } else if (nArgs) {
         boundArgs = MemberData::allocate(scope.engine, nArgs);