diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-09 16:02:55 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-10 08:19:59 +0000 |
| commit | 6a91dcba2e4fa85dc345c2d403c757ab7676e28c (patch) | |
| tree | 502b483cd437f4a1a039717af0a59e493d40f7a2 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | 5571b666e6b9534a55347adcd249fa07b2e25c01 (diff) | |
Always create a valid CallData object for interpreter calls
This will allow removing a few more special cases and to simplify
the code further.
Change-Id: I3a958e9f68e3c103ea4f2ee6825f893e5931b11d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 3549c6b9ea..27810dc836 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -368,7 +368,7 @@ ReturnedValue ScriptFunction::construct(const Managed *that, CallData *callData) QV4::Function *v4Function = f->function(); Q_ASSERT(v4Function); - ReturnedValue result = ExecutionContext::call(f->scope(), callData, v4Function, f); + ReturnedValue result = v4Function->call(f->scope(), callData, f); if (Q_UNLIKELY(v4->hasException)) return Encode::undefined(); @@ -388,7 +388,7 @@ ReturnedValue ScriptFunction::call(const Managed *that, CallData *callData) QV4::Function *v4Function = f->function(); Q_ASSERT(v4Function); - return ExecutionContext::call(f->scope(), callData, v4Function, f); + return v4Function->call(f->scope(), callData, f); } void Heap::ScriptFunction::init(QV4::ExecutionContext *scope, Function *function) |