diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-07 08:37:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-10 08:18:56 +0000 |
| commit | 30e3664bf3668bda9a211fe7d1404f8f806dbf7b (patch) | |
| tree | bd119839af7db0f6f9119401d478b37b44051c8b /src/qml/jsapi/qjsengine.cpp | |
| parent | eb2c08f57493aa12850e6cddff2cc3527e7cbfd7 (diff) | |
Avoid creating a CallContext for simple functions
This cuts out quite a bit of overhead when entering
and leaving functions.
Change-Id: I32670c98a4087ea3b2d45853d9cabff9066399e8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 61cc0294e2..5027975d84 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -446,7 +446,11 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in QV4::ScopedValue result(scope); QV4::Script script(ctx, program, fileName, lineNumber); - script.strictMode = ctx->d()->v4Function ? ctx->d()->v4Function->isStrict() : false; + script.strictMode = false; + if (v4->currentStackFrame) + script.strictMode = v4->currentStackFrame->v4Function->isStrict(); + else if (v4->globalCode) + script.strictMode = v4->globalCode->isStrict(); script.inheritContext = true; script.parse(); if (!scope.engine->hasException) |