Ported identifiers in moth to use runtime strings

Change-Id: I09f04994a2ebe631b12fa76b77a622711de31926
Reviewed-by: Lars Knoll <[email protected]>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 0effad944c..3c0dbe35b7 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -612,12 +612,15 @@ void ExecutionContext::throwURIError(Value msg)
 
 const Function *ExecutionContext::runtimeFunction() const
 {
-    if (type >= Type_CallContext) {
-        const QV4::FunctionObject *f = asCallContext()->function;
+    const ExecutionContext *ctx = this;
+    if (ctx->type == Type_CatchContext)
+        ctx = ctx->parent;
+    if (ctx->type >= Type_CallContext) {
+        const QV4::FunctionObject *f = ctx->asCallContext()->function;
         Q_ASSERT(f);
         return f ? f->function : 0;
     }
-    Q_ASSERT(type == Type_GlobalContext);
+    Q_ASSERT(ctx->type == Type_GlobalContext);
     return engine->globalCode;
 }