diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-08-15 11:46:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-15 13:34:35 +0200 |
| commit | df0ec196031d33850324dc5eeed2d71f61413885 (patch) | |
| tree | 9e98812061839c550f2d3b4e86f57a47e6bf2b37 /src/script/api/qscriptcontext.cpp | |
| parent | 8854338fe988a38514e69fe52a831a1ac3c6f936 (diff) | |
| download | qtscript-df0ec196031d33850324dc5eeed2d71f61413885.tar.gz | |
Make QScriptEngine::uncaughtExceptionBacktrace() work again
This function has been broken since Qt 4.6 (when the JavaScriptCore-
based back-end was introduced). Fix it by introducing a callback in
JSC that allows us to capture the stack when an uncaught exception
occurs.
Task-number: QTBUG-6139
Change-Id: I4a829323c9fb0c8b2f16a2e5d6f0aeb13cc32561
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/script/api/qscriptcontext.cpp')
| -rw-r--r-- | src/script/api/qscriptcontext.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index 8996654..7c1cb47 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -161,8 +161,10 @@ QScriptContext::QScriptContext() QScriptValue QScriptContext::throwValue(const QScriptValue &value) { JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this); - QScript::APIShim shim(QScript::scriptEngineFromExec(frame)); - JSC::JSValue jscValue = QScript::scriptEngineFromExec(frame)->scriptValueToJSCValue(value); + QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame); + QScript::APIShim shim(engine); + JSC::JSValue jscValue = engine->scriptValueToJSCValue(value); + engine->clearCurrentException(); frame->setException(jscValue); return value; } @@ -184,7 +186,8 @@ QScriptValue QScriptContext::throwValue(const QScriptValue &value) QScriptValue QScriptContext::throwError(Error error, const QString &text) { JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this); - QScript::APIShim shim(QScript::scriptEngineFromExec(frame)); + QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame); + QScript::APIShim shim(engine); JSC::ErrorType jscError = JSC::GeneralError; switch (error) { case UnknownError: @@ -206,7 +209,8 @@ QScriptValue QScriptContext::throwError(Error error, const QString &text) break; } JSC::JSObject *result = JSC::throwError(frame, jscError, text); - return QScript::scriptEngineFromExec(frame)->scriptValueFromJSCValue(result); + engine->clearCurrentException(); + return engine->scriptValueFromJSCValue(result); } /*! @@ -220,9 +224,11 @@ QScriptValue QScriptContext::throwError(Error error, const QString &text) QScriptValue QScriptContext::throwError(const QString &text) { JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this); - QScript::APIShim shim(QScript::scriptEngineFromExec(frame)); + QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame); + QScript::APIShim shim(engine); + engine->clearCurrentException(); JSC::JSObject *result = JSC::throwError(frame, JSC::GeneralError, text); - return QScript::scriptEngineFromExec(frame)->scriptValueFromJSCValue(result); + return engine->scriptValueFromJSCValue(result); } /*! |