diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-03-12 15:46:29 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-03-17 13:10:22 +0100 |
commit | 9caea013ceb221b5617c4940e7bb9ee9fecdd631 (patch) | |
tree | f4480e860a965f6515e516475baeced69b5d91fd /src/qml/qml/qqmlboundsignal.cpp | |
parent | b0e9c83f99aa7090c82b7c55894f5e264b74608a (diff) |
Clean up JSCallData setup
We either have pre-populated arguments and thisObject, then we can just
use them and keep them const. Or, we want to allocate and populate the
arguments and the thisObject. Then, do allocate them in a separate
object, and transform that into JSCallData afterwards if necessary.
Furthermore, avoid alloc(0) as that just returns the current stack top.
Writing to it will clobber other data. Rather, just use nullptr and
crash if it's written to.
Also, remove the useless operator-> from JSCallData. That one just
confuses the reader.
Change-Id: I8310911fcfe005b05a07b78fcb3791d991a0c2ce
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal.cpp')
-rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 8a641970e7..ee8fbe94e0 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -193,7 +193,7 @@ void QQmlBoundSignalExpression::evaluate(void **a) bool ok = QQmlMetaObject(m_target).methodParameterTypes(methodIndex, &storage, nullptr); const int argCount = ok ? storage.size() : 0; - QV4::JSCallData jsCall(scope, argCount); + QV4::JSCallArguments jsCall(scope, argCount); populateJSCallArguments(v4, jsCall, argCount, a, storage.constData()); QQmlJavaScriptExpression::evaluate(jsCall.callData(scope), nullptr); @@ -214,9 +214,9 @@ void QQmlBoundSignalExpression::evaluate(const QList<QVariant> &args) ep->referenceScarceResources(); // "hold" scarce resources in memory during evaluation. - QV4::JSCallData jsCall(scope, args.count()); + QV4::JSCallArguments jsCall(scope, args.count()); for (int ii = 0; ii < args.count(); ++ii) { - jsCall->args[ii] = scope.engine->fromVariant(args[ii]); + jsCall.args[ii] = scope.engine->fromVariant(args[ii]); } QQmlJavaScriptExpression::evaluate(jsCall.callData(scope), nullptr); |