diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-30 15:42:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-30 13:58:52 +0000 |
| commit | ec465af245e90598039c4aabab9641922db34394 (patch) | |
| tree | 074679eff5ac738b757c9e7b2f718b90cae9fedd | |
| parent | f7d758762e1680b1aca928e2b773803dc2515ad5 (diff) | |
Fix arithmetic with constants inside eval() calls on 32-bit architectures
On 32-bit architectures we usually use an external constants table,
which we need to make visible in the context.
Change-Id: I0f7d813da1c6c893b8dd641dab5685a6db7fa9fa
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
| -rw-r--r-- | src/qml/jsruntime/qv4globalobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index 1bc91f832b..f0630660d4 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -394,6 +394,7 @@ void EvalFunction::evalCall(Scope &scope, CallData *callData, bool directCall) c // set the correct strict mode flag on the context ctx->d()->strictMode = false; ctx->d()->compilationUnit = function->compilationUnit; + ctx->d()->constantTable = function->compilationUnit->constants; scope.result = Q_V4_PROFILE(ctx->engine(), function); } |