Further work towards an exact GC

Add some more convenience in the helper classes
in qscopedvalue_p.h
Make accesses to CallData safer, and change
ExecutionEngine::newObject() to return a safe
pointer.

Change-Id: I980909754ce9681cf6faa1355bab3a1e5d6dd186
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp
index 6c028de372..62937921aa 100644
--- a/src/qml/jsruntime/qv4argumentsobject.cpp
+++ b/src/qml/jsruntime/qv4argumentsobject.cpp
@@ -84,12 +84,12 @@ ArgumentsObject::ArgumentsObject(CallContext *context)
         ensureArrayAttributes();
         context->engine->requireArgumentsAccessors(numAccessors);
         for (uint i = 0; i < (uint)numAccessors; ++i) {
-            mappedArguments.append(context->argument(i));
+            mappedArguments.append(context->arguments[i]);
             arrayData[i] = context->engine->argumentsAccessors.at(i);
             arrayAttributes[i] = Attr_Accessor;
         }
         for (uint i = numAccessors; i < argCount; ++i) {
-            arrayData[i] = Property::fromValue(context->argument(i));
+            arrayData[i] = Property::fromValue(context->arguments[i]);
             arrayAttributes[i] = Attr_Data;
         }
         arrayDataLen = argCount;
@@ -160,7 +160,7 @@ ReturnedValue ArgumentsGetterFunction::call(Managed *getter, CallData *callData)
         getter->engine()->current->throwTypeError();
 
     assert(g->index < o->context->argumentCount);
-    return o->context->argument(g->index).asReturnedValue();
+    return o->context->argument(g->index);
 }
 
 DEFINE_MANAGED_VTABLE(ArgumentsSetterFunction);