diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-16 22:02:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | e441692b0b8f8fffdfdfa8a21c570adcd5cbae7a (patch) | |
| tree | 9b764401d87682012328c46dc947721f47b428b2 /src/qml/jsruntime/qv4runtime.cpp | |
| parent | a0f8be4021caa9bb5055923f0eea3bee0e345235 (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 2bd201e2a1..446ea9df3a 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -1196,8 +1196,9 @@ void __qmljs_builtin_define_getter_setter(ExecutionContext *ctx, const ValueRef ReturnedValue __qmljs_builtin_define_object_literal(QV4::ExecutionContext *ctx, const QV4::Value *args, int classId) { + Scope scope(ctx); QV4::InternalClass *klass = ctx->compilationUnit->runtimeClasses[classId]; - Object *o = ctx->engine->newObject(klass); + Scoped<Object> o(scope, ctx->engine->newObject(klass)); for (int i = 0; i < klass->size; ++i) { if (klass->propertyData[i].isData()) @@ -1210,7 +1211,7 @@ ReturnedValue __qmljs_builtin_define_object_literal(QV4::ExecutionContext *ctx, } } - return Value::fromObject(o).asReturnedValue(); + return o.asReturnedValue(); } QV4::ReturnedValue __qmljs_builtin_setup_arguments_object(ExecutionContext *ctx) |