diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-10-21 17:07:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 10:38:48 +0100 |
| commit | 34bf0139c75de861c948391737af3c8c2a42703c (patch) | |
| tree | 3eeeb615078c27b30e15a77adcda7d6537baef17 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 5229a8b259286c9ea61036fd6b4bd0039104a206 (diff) | |
Rework IR code generation for try/catch/finally
Simplify the generated code. Add a special block to catch
exceptions thrown inside a catch() statement.
store the exception on the stack when entering finally and
rethrow it at the end. This ensure correct behavior for
break/continue/return statements inside finally.
Don't check for exceptions after calling push_catch_scope
and pop_scope in the JIT'ed code. This can lead to infinite
loops when throwing inside an exception handler.
Change-Id: I67e9325794e2fd25b0773b21e02fbaadb43faab0
Change-Id: Ic1ea9c0c43eec1d49177dc1ab4552a1da04e96fe
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 3449c1aa3c..73db54174c 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -834,7 +834,7 @@ ReturnedValue ExecutionEngine::catchException(ExecutionContext *catchingContext, exceptionStackTrace.clear(); hasException = false; ReturnedValue res = exceptionValue.asReturnedValue(); - exceptionValue = Encode::undefined(); + exceptionValue = Primitive::emptyValue(); return res; } |