1 files changed, 3 insertions, 26 deletions

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 25d6fc1970..1c20ad30aa 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -128,7 +128,8 @@ public:
         --jsStackTop;
         return jsStackTop->heapObject();
     }
-    Value *jsAlloca(int nValues) {
+
+    QML_NEARLY_ALWAYS_INLINE Value *jsAlloca(int nValues) {
         Value *ptr = jsStackTop;
         jsStackTop = ptr + nValues;
         for (int i = 0; i < nValues; ++i)
@@ -254,7 +255,7 @@ public:
     InternalClass *stringClass;
 
     InternalClass *functionClass;
-    InternalClass *simpleScriptFunctionClass;
+    InternalClass *scriptFunctionClass;
     InternalClass *protoClass;
 
     InternalClass *regExpExecArrayClass;
@@ -547,27 +548,6 @@ inline ExecutionContext *ExecutionEngine::parentContext(ExecutionContext *contex
     return o ? context - o : 0;
 }
 
-inline Heap::QmlContext *ExecutionEngine::qmlContext() const
-{
-    Heap::ExecutionContext *ctx = current;
-
-    // get the correct context when we're within a builtin function
-    if (ctx->type == Heap::ExecutionContext::Type_SimpleCallContext && !ctx->outer)
-        ctx = parentContext(currentContext)->d();
-
-    if (ctx->type != Heap::ExecutionContext::Type_QmlContext && !ctx->outer)
-        return 0;
-
-    while (ctx->outer && ctx->outer->type != Heap::ExecutionContext::Type_GlobalContext)
-        ctx = ctx->outer;
-
-    Q_ASSERT(ctx);
-    if (ctx->type != Heap::ExecutionContext::Type_QmlContext)
-        return 0;
-
-    return static_cast<Heap::QmlContext *>(ctx);
-}
-
 inline
 void Heap::Base::mark(QV4::ExecutionEngine *engine)
 {
@@ -583,9 +563,6 @@ void Heap::Base::mark(QV4::ExecutionEngine *engine)
 
 inline void Value::mark(ExecutionEngine *e)
 {
-    if (!isManaged())
-        return;
-
     Heap::Base *o = heapObject();
     if (o)
         o->mark(e);