Get rid of qv4qmlextensions

It only contained the proto for the value type wrapper. Instead
just create it lazily, but reserve space on the js stack for it.

Change-Id: I2301549b6dc4007bd5ac848e1dca25aafd583c4a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index a54d375192..bb7913b78c 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -59,7 +59,6 @@
 #include "qv4executableallocator_p.h"
 #include "qv4sequenceobject_p.h"
 #include "qv4qobjectwrapper_p.h"
-#include "qv4qmlextensions_p.h"
 #include "qv4memberdata_p.h"
 #include "qv4arraybuffer_p.h"
 #include "qv4dataview_p.h"
@@ -207,7 +206,6 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
     , m_engineId(engineSerial.fetchAndAddOrdered(1))
     , regExpCache(0)
     , m_multiplyWrappedQObjects(0)
-    , m_qmlExtensions(0)
 {
     MemoryManager::GCBlocker gcBlocker(memoryManager);
 
@@ -392,6 +390,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
     jsObjects[DataView_Ctor] = memoryManager->alloc<DataViewCtor>(global);
     jsObjects[DataViewProto] = memoryManager->alloc<DataViewPrototype>(emptyClass, objectPrototype());
     static_cast<DataViewPrototype *>(dataViewPrototype())->init(this, dataViewCtor());
+    jsObjects[ValueTypeProto] = (Heap::Base *) 0;
 
     for (int i = 0; i < Heap::TypedArray::NTypes; ++i) {
         static_cast<Value &>(typedArrayCtors[i]) = memoryManager->alloc<TypedArrayCtor>(global, Heap::TypedArray::Type(i));
@@ -470,7 +469,6 @@ ExecutionEngine::~ExecutionEngine()
     foreach (QV4::CompiledData::CompilationUnit *unit, remainingUnits)
         unit->unlink();
 
-    delete m_qmlExtensions;
     emptyClass->destroy();
     delete classPool;
     delete bumperPointerAllocator;
@@ -906,9 +904,6 @@ void ExecutionEngine::markObjects()
         c = c->parent;
     }
 
-    if (m_qmlExtensions)
-        m_qmlExtensions->markObjects(this);
-
     classPool->markObjects(this);
 
     for (QSet<CompiledData::CompilationUnit*>::ConstIterator it = compilationUnits.constBegin(), end = compilationUnits.constEnd();
@@ -916,13 +911,6 @@ void ExecutionEngine::markObjects()
         (*it)->markObjects(this);
 }
 
-QmlExtensions *ExecutionEngine::qmlExtensions()
-{
-    if (!m_qmlExtensions)
-        m_qmlExtensions = new QmlExtensions;
-    return m_qmlExtensions;
-}
-
 ReturnedValue ExecutionEngine::throwError(const Value &value)
 {
     // we can get in here with an exception already set, as the runtime