diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-06 13:48:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 13:02:00 +0200 |
| commit | e6180ecdc2144786c58d2f9d615f698ca3442382 (patch) | |
| tree | a6b9f468b4ba5aeb4a99662d7a87a7353071ce52 /src/qml/compiler/qv4compileddata.cpp | |
| parent | f9fda643ab7aa1a66e4816382f0e66499818f42a (diff) | |
Properly unwind the js stack for generated code
Surround all calls into generated code with a
try {} catch {} statement that resets the jstack
to the correct position.
Like this we properly unwind the js stack in all cases, and
can also use stricter assertions in our ScopedCallData, etc.
classes to check that the stack is healthy.
Change-Id: I7ca03e06ea55007be683305d9c2a6898cf5fc689
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4compileddata.cpp')
| -rw-r--r-- | src/qml/compiler/qv4compileddata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp index bf1395822d..efe9d70964 100644 --- a/src/qml/compiler/qv4compileddata.cpp +++ b/src/qml/compiler/qv4compileddata.cpp @@ -57,7 +57,7 @@ namespace CompiledData { namespace { bool functionSortHelper(QV4::Function *lhs, QV4::Function *rhs) { - return reinterpret_cast<quintptr>(lhs->code) < reinterpret_cast<quintptr>(rhs->code); + return reinterpret_cast<quintptr>(lhs->codePtr) < reinterpret_cast<quintptr>(rhs->codePtr); } } |