diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
index 5b96163b48..14dfc5356e 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp
@@ -336,18 +336,16 @@ void NativeDebugger::handleBacktrace(QJsonObject *response, const QJsonObject &a
     QJsonArray frameArray;
     QV4::ExecutionContext *executionContext = m_engine->currentContext;
     for (int i  = 0; i < limit && executionContext; ++i) {
-        QV4::Heap::FunctionObject *heapFunctionObject = executionContext->getFunctionObject();
-        if (heapFunctionObject) {
+        if (QV4::Function *function = executionContext->getFunction()) {
 
             QJsonObject frame;
             frame[QStringLiteral("language")] = QStringLiteral("js");
             frame[QStringLiteral("context")] = encodeContext(executionContext);
 
-            if (QV4::Function *function = heapFunctionObject->function) {
-                if (QV4::Heap::String *functionName = function->name())
-                    frame[QStringLiteral("function")] = functionName->toQString();
-                frame[QStringLiteral("file")] = function->sourceFile();
-            }
+            if (QV4::Heap::String *functionName = function->name())
+                frame[QStringLiteral("function")] = functionName->toQString();
+            frame[QStringLiteral("file")] = function->sourceFile();
+
             int line = executionContext->d()->lineNumber;
             frame[QStringLiteral("line")] = (line < 0 ? -line : line);
 
@@ -667,11 +665,9 @@ void NativeDebugger::aboutToThrow()
 
 QV4::Function *NativeDebugger::getFunction() const
 {
-    QV4::Scope scope(m_engine);
     QV4::ExecutionContext *context = m_engine->currentContext;
-    QV4::ScopedFunctionObject function(scope, context->getFunctionObject());
-    if (function)
-        return function->function();
+    if (QV4::Function *function = context->getFunction())
+        return function;
     else
         return context->d()->engine->globalCode;
 }
@@ -683,10 +679,8 @@ void NativeDebugger::pauseAndWait()
     event.insert(QStringLiteral("event"), QStringLiteral("break"));
     event.insert(QStringLiteral("language"), QStringLiteral("js"));
     if (QV4::ExecutionContext *executionContext = m_engine->currentContext) {
-        QV4::Heap::FunctionObject *heapFunctionObject = executionContext->getFunctionObject();
-        if (heapFunctionObject) {
-            if (QV4::Function *function = heapFunctionObject->function)
-                event.insert(QStringLiteral("file"), function->sourceFile());
+        if (QV4::Function *function = executionContext->getFunction()) {
+            event.insert(QStringLiteral("file"), function->sourceFile());
             int line = executionContext->d()->lineNumber;
             event.insert(QStringLiteral("line"), (line < 0 ? -line : line));
         }
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
index 44810dd4cb..5cc2043cb1 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
@@ -252,9 +252,8 @@ QV4::Function *QV4Debugger::getFunction() const
 {
     QV4::Scope scope(m_engine);
     QV4::ExecutionContext *context = m_engine->currentContext;
-    QV4::ScopedFunctionObject function(scope, context->getFunctionObject());
-    if (function)
-        return function->function();
+    if (QV4::Function *function = context->getFunction())
+        return function;
     else
         return context->d()->engine->globalCode;
 }
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 5d4a1b07b5..26f2f996a6 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -524,13 +524,13 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Value *base)
     return engine()->throwReferenceError(n);
 }
 
-Heap::FunctionObject *ExecutionContext::getFunctionObject() const
+Function *ExecutionContext::getFunction() const
 {
     Scope scope(d()->engine);
     ScopedContext it(scope, this->d());
     for (; it; it = it->d()->outer) {
         if (const CallContext *callCtx = it->asCallContext())
-            return callCtx->d()->function;
+            return callCtx->d()->v4Function;
         else if (it->asCatchContext() || it->asWithContext())
             continue; // look in the parent context for a FunctionObject
         else
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index e5fd67d410..7bf58ab5c6 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -214,7 +214,7 @@ struct Q_QML_EXPORT ExecutionContext : public Managed
     inline const CatchContext *asCatchContext() const;
     inline const WithContext *asWithContext() const;
 
-    Heap::FunctionObject *getFunctionObject() const;
+    Function *getFunction() const;
 
     static void markObjects(Heap::Base *m, ExecutionEngine *e);
 
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 698c73a910..c438b99cf0 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -780,21 +780,17 @@ QVector<StackFrame> ExecutionEngine::stackTrace(int frameLimit) const
     QVector<StackFrame> stack;
 
     ExecutionContext *c = currentContext;
-    ScopedFunctionObject function(scope);
     while (c && frameLimit) {
-        function = c->getFunctionObject();
+        QV4::Function *function = c->getFunction();
         if (function) {
             StackFrame frame;
-            if (const Function *f = function->function())
-                frame.source = f->sourceFile();
+            frame.source = function->sourceFile();
             name = function->name();
             frame.function = name->toQString();
-            frame.line = -1;
-            frame.column = -1;
 
-            if (function->function())
-                // line numbers can be negative for places where you can't set a real breakpoint
-                frame.line = qAbs(c->d()->lineNumber);
+            // line numbers can be negative for places where you can't set a real breakpoint
+            frame.line = qAbs(c->d()->lineNumber);
+            frame.column = -1;
 
             stack.append(frame);
             --frameLimit;
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index b19c36a5bd..622359a7d9 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -169,10 +169,8 @@ static Breakpoint qt_v4LastStop;
 
 static QV4::Function *qt_v4ExtractFunction(QV4::ExecutionContext *context)
 {
-    QV4::Scope scope(context->engine());
-    QV4::ScopedFunctionObject function(scope, context->getFunctionObject());
-    if (function)
-        return function->function();
+    if (QV4::Function *function = context->getFunction())
+        return function;
     else
         return context->d()->engine->globalCode;
 }