Use Heap::Pointer in more places

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

10 files changed, 24 insertions, 26 deletions

diff --git a/src/qml/jsruntime/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h
index b49962db07..19659429a7 100644
--- a/src/qml/jsruntime/qv4argumentsobject_p.h
+++ b/src/qml/jsruntime/qv4argumentsobject_p.h
@@ -59,9 +59,9 @@ struct ArgumentsObject : Object {
         CallerPropertyIndex = 3
     };
     ArgumentsObject(QV4::CallContext *context);
-    CallContext *context;
+    Pointer<CallContext> context;
     bool fullyCreated;
-    MemberData *mappedArguments;
+    Pointer<MemberData> mappedArguments;
 };
 
 }
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 2cff65b3d9..c35263ba7e 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -85,8 +85,8 @@ struct ExecutionContext : Base {
     CallData *callData;
 
     ExecutionEngine *engine;
-    ExecutionContext *parent;
-    ExecutionContext *outer;
+    Pointer<ExecutionContext> parent;
+    Pointer<ExecutionContext> outer;
     Lookup *lookups;
     CompiledData::CompilationUnit *compilationUnit;
 
@@ -105,14 +105,14 @@ struct CallContext : ExecutionContext {
     }
     CallContext(ExecutionEngine *engine, QV4::Object *qml, QV4::FunctionObject *function);
 
-    FunctionObject *function;
+    Pointer<FunctionObject> function;
     Value *locals;
-    Object *activation;
+    Pointer<Object> activation;
 };
 
 struct GlobalContext : ExecutionContext {
     GlobalContext(ExecutionEngine *engine);
-    Object *global;
+    Pointer<Object> global;
 };
 
 struct CatchContext : ExecutionContext {
@@ -123,7 +123,7 @@ struct CatchContext : ExecutionContext {
 
 struct WithContext : ExecutionContext {
     WithContext(ExecutionEngine *engine, QV4::Object *with);
-    Object *withObject;
+    Pointer<Object> withObject;
 };
 
 
diff --git a/src/qml/jsruntime/qv4dataview_p.h b/src/qml/jsruntime/qv4dataview_p.h
index 3f352883b8..e98239396a 100644
--- a/src/qml/jsruntime/qv4dataview_p.h
+++ b/src/qml/jsruntime/qv4dataview_p.h
@@ -48,7 +48,7 @@ struct DataViewCtor : FunctionObject {
 
 struct DataView : Object {
     DataView(ExecutionEngine *e);
-    ArrayBuffer *buffer;
+    Pointer<ArrayBuffer> buffer;
     uint byteLength;
     uint byteOffset;
 };
diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h
index e26654e931..da2c978e5f 100644
--- a/src/qml/jsruntime/qv4errorobject_p.h
+++ b/src/qml/jsruntime/qv4errorobject_p.h
@@ -62,7 +62,7 @@ struct ErrorObject : Object {
 
     ErrorType errorType;
     StackTrace stackTrace;
-    String *stack;
+    Pointer<String> stack;
 };
 
 struct EvalErrorObject : ErrorObject {
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 2aa5d95831..67a929554b 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -65,7 +65,7 @@ struct Q_QML_PRIVATE_EXPORT FunctionObject : Object {
     unsigned int varCount() { return function ? function->compiledFunction->nLocals : 0; }
     bool needsActivation() const { return function ? function->needsActivation() : false; }
 
-    ExecutionContext *scope;
+    Pointer<ExecutionContext> scope;
     Function *function;
 };
 
@@ -102,9 +102,9 @@ struct ScriptFunction : SimpleScriptFunction {
 
 struct BoundFunction : FunctionObject {
     BoundFunction(QV4::ExecutionContext *scope, QV4::FunctionObject *target, const Value &boundThis, QV4::MemberData *boundArgs);
-    FunctionObject *target;
+    Pointer<FunctionObject> target;
     Value boundThis;
-    MemberData *boundArgs;
+    Pointer<MemberData> boundArgs;
 };
 
 }
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 1948d047fb..06d9a6da67 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -231,7 +231,7 @@ Heap::RegExpCtor::RegExpCtor(QV4::ExecutionContext *scope)
 void Heap::RegExpCtor::clearLastMatch()
 {
     lastMatch = Primitive::nullValue();
-    lastInput = internalClass->engine->id_empty;
+    lastInput = internalClass->engine->id_empty->d();
     lastMatchStart = 0;
     lastMatchEnd = 0;
 }
@@ -300,7 +300,7 @@ void RegExpCtor::markObjects(Heap::Base *that, ExecutionEngine *e)
 {
     RegExpCtor::Data *This = static_cast<RegExpCtor::Data *>(that);
     This->lastMatch.mark(e);
-    This->lastInput.mark(e);
+    This->lastInput->mark(e);
     FunctionObject::markObjects(that, e);
 }
 
@@ -388,7 +388,7 @@ ReturnedValue RegExpPrototype::method_exec(CallContext *ctx)
 
     RegExpCtor::Data *dd = regExpCtor->d();
     dd->lastMatch = array;
-    dd->lastInput = arg->stringValue();
+    dd->lastInput = arg->stringValue()->d();
     dd->lastMatchStart = matchOffsets[0];
     dd->lastMatchEnd = matchOffsets[1];
 
@@ -455,7 +455,7 @@ ReturnedValue RegExpPrototype::method_get_lastParen(CallContext *ctx)
 
 ReturnedValue RegExpPrototype::method_get_input(CallContext *ctx)
 {
-    return static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastInput().asReturnedValue();
+    return static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastInput()->asReturnedValue();
 }
 
 ReturnedValue RegExpPrototype::method_get_leftContext(CallContext *ctx)
diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index 34acea6df1..af83282fe4 100644
--- a/src/qml/jsruntime/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
@@ -61,14 +61,14 @@ struct RegExpObject : Object {
     RegExpObject(QV4::ExecutionEngine *engine, QV4::RegExp *value, bool global);
     RegExpObject(QV4::ExecutionEngine *engine, const QRegExp &re);
 
-    RegExp *value;
+    Pointer<RegExp> value;
     bool global;
 };
 
 struct RegExpCtor : FunctionObject {
     RegExpCtor(QV4::ExecutionContext *scope);
     Value lastMatch;
-    StringValue lastInput;
+    Pointer<String> lastInput;
     int lastMatchStart;
     int lastMatchEnd;
     void clearLastMatch();
@@ -117,7 +117,7 @@ struct RegExpCtor: FunctionObject
     V4_OBJECT2(RegExpCtor, FunctionObject)
 
     Value lastMatch() { return d()->lastMatch; }
-    StringValue lastInput() { return d()->lastInput; }
+    Heap::String *lastInput() { return d()->lastInput; }
     int lastMatchStart() { return d()->lastMatchStart; }
     int lastMatchEnd() { return d()->lastMatchEnd; }
 
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 05653c1177..bd5529294c 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -154,7 +154,7 @@ void QmlBindingWrapper::markObjects(Heap::Base *m, ExecutionEngine *e)
 static ReturnedValue signalParameterGetter(QV4::CallContext *ctx, uint parameterIndex)
 {
     QV4::Scope scope(ctx);
-    QV4::Scoped<CallContext> signalEmittingContext(scope, static_cast<Heap::CallContext *>(ctx->d()->parent));
+    QV4::Scoped<CallContext> signalEmittingContext(scope, ctx->d()->parent.cast<Heap::CallContext>());
     Q_ASSERT(signalEmittingContext && signalEmittingContext->d()->type >= QV4::Heap::ExecutionContext::Type_SimpleCallContext);
     return signalEmittingContext->argument(parameterIndex);
 }
diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index fcc24b6cb7..998a2cff72 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -90,8 +90,8 @@ struct QmlBindingWrapper : Heap::FunctionObject {
     QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::Object *qml);
     // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
     QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Object *qml);
-    Object *qml;
-    CallContext *qmlContext;
+    Pointer<Object> qml;
+    Pointer<CallContext> qmlContext;
 };
 
 }
@@ -106,8 +106,6 @@ struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
 
     static Heap::FunctionObject *createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, QV4::Function *runtimeFunction,
                                                               const QList<QByteArray> &signalParameters = QList<QByteArray>(), QString *error = 0);
-
-private:
 };
 
 struct Q_QML_EXPORT Script {
diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h
index d2f5eeaf44..8e1090dcd2 100644
--- a/src/qml/jsruntime/qv4typedarray_p.h
+++ b/src/qml/jsruntime/qv4typedarray_p.h
@@ -72,7 +72,7 @@ struct TypedArray : Object {
     TypedArray(ExecutionEngine *e, Type t);
 
     const TypedArrayOperations *type;
-    ArrayBuffer *buffer;
+    Pointer<ArrayBuffer> buffer;
     uint byteLength;
     uint byteOffset;
     Type arrayType;