Move exceptionValue and globalObject from the Engine onto the JS stack

We'll need to move all GC'ed objects currently stored in ExecutionEngine
onto the JS stack for easier management in a new garbage collection
scheme. This is the start of that change.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 11bfa62afc..0951015dde 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -106,7 +106,7 @@ void ExecutionContext::createMutableBinding(String *name, bool deletable)
     Scope scope(this);
 
     // find the right context to create the binding on
-    ScopedObject activation(scope, d()->engine->globalObject());
+    ScopedObject activation(scope, d()->engine->globalObject);
     ScopedContext ctx(scope, this);
     while (ctx) {
         if (ctx->d()->type >= Heap::ExecutionContext::Type_CallContext) {
@@ -131,7 +131,7 @@ void ExecutionContext::createMutableBinding(String *name, bool deletable)
 Heap::GlobalContext::GlobalContext(ExecutionEngine *eng)
     : Heap::ExecutionContext(eng, Heap::ExecutionContext::Type_GlobalContext)
 {
-    global = eng->globalObject()->d();
+    global = eng->globalObject->d();
 }
 
 Heap::WithContext::WithContext(ExecutionEngine *engine, QV4::Object *with)
@@ -333,7 +333,7 @@ void ExecutionContext::setProperty(String *name, const Value &value)
         engine()->throwReferenceError(n);
         return;
     }
-    d()->engine->globalObject()->put(name, value);
+    d()->engine->globalObject->put(name, value);
 }
 
 ReturnedValue ExecutionContext::getProperty(String *name)