From 2a8de9d8d85c5ce3e9c61fd8c0e957521f6a0846 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 28 Aug 2015 12:58:08 +0200 Subject: Convert FunctionObjects to new allocation syntax Change-Id: I269c20abdc7f9eb0d71a2d2d485d622b65405762 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4argumentsobject.cpp | 4 +-- src/qml/jsruntime/qv4engine.cpp | 52 ++++++++++++++++---------------- src/qml/jsruntime/qv4functionobject.cpp | 33 ++++++++------------ src/qml/jsruntime/qv4functionobject_p.h | 11 ++++--- src/qml/jsruntime/qv4jsonobject.cpp | 5 ++- src/qml/jsruntime/qv4jsonobject_p.h | 2 +- src/qml/jsruntime/qv4mathobject.cpp | 5 ++- src/qml/jsruntime/qv4mathobject_p.h | 2 +- src/qml/jsruntime/qv4qobjectwrapper.cpp | 4 +-- src/qml/jsruntime/qv4runtime.cpp | 3 +- src/qml/jsruntime/qv4script.cpp | 4 +-- src/qml/qml/qqmlxmlhttprequest.cpp | 2 +- src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 +- src/qml/types/qqmldelegatemodel.cpp | 2 +- src/qml/util/qqmladaptormodel.cpp | 4 +-- tools/qmljs/qmljs.cpp | 4 +-- 16 files changed, 65 insertions(+), 74 deletions(-) diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp index c935e67aff..698b4c325c 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -40,9 +40,7 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(ArgumentsObject); Heap::ArgumentsObject::ArgumentsObject(QV4::CallContext *context) - : Heap::Object(context->d()->strictMode ? context->d()->engine->strictArgumentsObjectClass : context->d()->engine->argumentsObjectClass, - context->d()->engine->objectPrototype()) - , context(context->d()) + : context(context->d()) , fullyCreated(false) { Q_ASSERT(vtable() == QV4::ArgumentsObject::staticVTable()); diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 8fabecb3d4..b3017e694d 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -322,7 +322,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) uint index; InternalClass *functionProtoClass = emptyClass->addMember(id_prototype(), Attr_NotEnumerable, &index); Q_ASSERT(index == Heap::FunctionObject::Index_Prototype); - jsObjects[FunctionProto] = memoryManager->alloc(functionProtoClass, objectPrototype()); + jsObjects[FunctionProto] = memoryManager->allocObject(functionProtoClass, objectPrototype()); functionClass = emptyClass->addMember(id_prototype(), Attr_NotEnumerable|Attr_NotConfigurable, &index); Q_ASSERT(index == Heap::FunctionObject::Index_Prototype); simpleScriptFunctionClass = functionClass->addMember(id_name(), Attr_ReadOnly, &index); @@ -379,21 +379,21 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) jsObjects[SequenceProto] = ScopedValue(scope, memoryManager->allocObject(arrayClass, arrayPrototype())); ExecutionContext *global = rootContext(); - jsObjects[Object_Ctor] = memoryManager->alloc(global); - jsObjects[String_Ctor] = memoryManager->alloc(global); - jsObjects[Number_Ctor] = memoryManager->alloc(global); - jsObjects[Boolean_Ctor] = memoryManager->alloc(global); - jsObjects[Array_Ctor] = memoryManager->alloc(global); - jsObjects[Function_Ctor] = memoryManager->alloc(global); - jsObjects[Date_Ctor] = memoryManager->alloc(global); - jsObjects[RegExp_Ctor] = memoryManager->alloc(global); - jsObjects[Error_Ctor] = memoryManager->alloc(global); - jsObjects[EvalError_Ctor] = memoryManager->alloc(global); - jsObjects[RangeError_Ctor] = memoryManager->alloc(global); - jsObjects[ReferenceError_Ctor] = memoryManager->alloc(global); - jsObjects[SyntaxError_Ctor] = memoryManager->alloc(global); - jsObjects[TypeError_Ctor] = memoryManager->alloc(global); - jsObjects[URIError_Ctor] = memoryManager->alloc(global); + jsObjects[Object_Ctor] = memoryManager->allocObject(global); + jsObjects[String_Ctor] = memoryManager->allocObject(global); + jsObjects[Number_Ctor] = memoryManager->allocObject(global); + jsObjects[Boolean_Ctor] = memoryManager->allocObject(global); + jsObjects[Array_Ctor] = memoryManager->allocObject(global); + jsObjects[Function_Ctor] = memoryManager->allocObject(global); + jsObjects[Date_Ctor] = memoryManager->allocObject(global); + jsObjects[RegExp_Ctor] = memoryManager->allocObject(global); + jsObjects[Error_Ctor] = memoryManager->allocObject(global); + jsObjects[EvalError_Ctor] = memoryManager->allocObject(global); + jsObjects[RangeError_Ctor] = memoryManager->allocObject(global); + jsObjects[ReferenceError_Ctor] = memoryManager->allocObject(global); + jsObjects[SyntaxError_Ctor] = memoryManager->allocObject(global); + jsObjects[TypeError_Ctor] = memoryManager->allocObject(global); + jsObjects[URIError_Ctor] = memoryManager->allocObject(global); static_cast(objectPrototype())->init(this, objectCtor()); static_cast(stringPrototype())->init(this, stringCtor()); @@ -417,17 +417,17 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) // typed arrays - jsObjects[ArrayBuffer_Ctor] = memoryManager->alloc(global); - jsObjects[ArrayBufferProto] = memoryManager->alloc(emptyClass, objectPrototype()); + jsObjects[ArrayBuffer_Ctor] = memoryManager->allocObject(global); + jsObjects[ArrayBufferProto] = memoryManager->allocObject(); static_cast(arrayBufferPrototype())->init(this, arrayBufferCtor()); - jsObjects[DataView_Ctor] = memoryManager->alloc(global); - jsObjects[DataViewProto] = memoryManager->alloc(emptyClass, objectPrototype()); + jsObjects[DataView_Ctor] = memoryManager->allocObject(global); + jsObjects[DataViewProto] = memoryManager->allocObject(); static_cast(dataViewPrototype())->init(this, dataViewCtor()); jsObjects[ValueTypeProto] = (Heap::Base *) 0; for (int i = 0; i < Heap::TypedArray::NTypes; ++i) { - static_cast(typedArrayCtors[i]) = memoryManager->alloc(global, Heap::TypedArray::Type(i)); + static_cast(typedArrayCtors[i]) = memoryManager->allocObject(global, Heap::TypedArray::Type(i)); static_cast(typedArrayPrototype[i]) = memoryManager->alloc(this, Heap::TypedArray::Type(i)); typedArrayPrototype[i].as()->init(this, static_cast(typedArrayCtors[i].as())); } @@ -460,15 +460,15 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) for (int i = 0; i < Heap::TypedArray::NTypes; ++i) globalObject->defineDefaultProperty((str = typedArrayCtors[i].as()->name())->toQString(), typedArrayCtors[i]); ScopedObject o(scope); - globalObject->defineDefaultProperty(QStringLiteral("Math"), (o = memoryManager->alloc(this))); - globalObject->defineDefaultProperty(QStringLiteral("JSON"), (o = memoryManager->alloc(this))); + globalObject->defineDefaultProperty(QStringLiteral("Math"), (o = memoryManager->allocObject())); + globalObject->defineDefaultProperty(QStringLiteral("JSON"), (o = memoryManager->allocObject())); globalObject->defineReadonlyProperty(QStringLiteral("undefined"), Primitive::undefinedValue()); globalObject->defineReadonlyProperty(QStringLiteral("NaN"), Primitive::fromDouble(std::numeric_limits::quiet_NaN())); globalObject->defineReadonlyProperty(QStringLiteral("Infinity"), Primitive::fromDouble(Q_INFINITY)); - jsObjects[Eval_Function] = memoryManager->alloc(global); + jsObjects[Eval_Function] = memoryManager->allocObject(global); globalObject->defineDefaultProperty(QStringLiteral("eval"), *evalFunction()); globalObject->defineDefaultProperty(QStringLiteral("parseInt"), GlobalFunctions::method_parseInt, 2); @@ -940,8 +940,8 @@ void ExecutionEngine::requireArgumentsAccessors(int n) } ExecutionContext *global = rootContext(); for (int i = oldSize; i < nArgumentsAccessors; ++i) { - argumentsAccessors[i].value = ScopedValue(scope, memoryManager->alloc(global, i)); - argumentsAccessors[i].set = ScopedValue(scope, memoryManager->alloc(global, i)); + argumentsAccessors[i].value = ScopedValue(scope, memoryManager->allocObject(global, i)); + argumentsAccessors[i].set = ScopedValue(scope, memoryManager->allocObject(global, i)); } } } diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 13b52622e7..a94c3f6db5 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -63,8 +63,7 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(FunctionObject); Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, QV4::String *name, bool createProto) - : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype()) - , scope(scope->d()) + : scope(scope->d()) , function(Q_NULLPTR) { Scope s(scope->engine()); @@ -73,8 +72,7 @@ Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, QV4::String * } Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, Function *function, bool createProto) - : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype()) - , scope(scope->d()) + : scope(scope->d()) , function(Q_NULLPTR) { Scope s(scope->engine()); @@ -84,8 +82,7 @@ Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, Function *fun } Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, const QString &name, bool createProto) - : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype()) - , scope(scope->d()) + : scope(scope->d()) , function(Q_NULLPTR) { Scope s(scope->engine()); @@ -95,8 +92,7 @@ Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, const QString } Heap::FunctionObject::FunctionObject(ExecutionContext *scope, const QString &name, bool createProto) - : Heap::Object(scope->engine->functionClass, scope->engine->functionPrototype()) - , scope(scope) + : scope(scope) , function(Q_NULLPTR) { Scope s(scope->engine); @@ -106,8 +102,7 @@ Heap::FunctionObject::FunctionObject(ExecutionContext *scope, const QString &nam } Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, const ReturnedValue name) - : Heap::Object(scope->d()->engine->functionClass, scope->d()->engine->functionPrototype()) - , scope(scope->d()) + : scope(scope->d()) , function(Q_NULLPTR) { Scope s(scope); @@ -117,8 +112,7 @@ Heap::FunctionObject::FunctionObject(QV4::ExecutionContext *scope, const Returne } Heap::FunctionObject::FunctionObject(ExecutionContext *scope, const ReturnedValue name) - : Heap::Object(scope->engine->functionClass, scope->engine->functionPrototype()) - , scope(scope) + : scope(scope) , function(Q_NULLPTR) { Scope s(scope->engine); @@ -127,12 +121,11 @@ Heap::FunctionObject::FunctionObject(ExecutionContext *scope, const ReturnedValu f->init(n, false); } -Heap::FunctionObject::FunctionObject(InternalClass *ic, QV4::Object *prototype) - : Heap::Object(ic, prototype) - , scope(ic->engine->rootContext()->d()) +Heap::FunctionObject::FunctionObject() + : scope(internalClass->engine->rootContext()->d()) , function(Q_NULLPTR) { - Q_ASSERT(ic && ic->find(ic->engine->id_prototype()) == Index_Prototype); + Q_ASSERT(internalClass && internalClass->find(internalClass->engine->id_prototype()) == Index_Prototype); *propertyData(Index_Prototype) = Encode::undefined(); } @@ -200,8 +193,8 @@ Heap::FunctionObject *FunctionObject::createScriptFunction(ExecutionContext *sco function->compiledFunction->flags & CompiledData::Function::HasCatchOrWith || function->compiledFunction->nFormals > QV4::Global::ReservedArgumentCount || function->isNamedExpression()) - return scope->d()->engine->memoryManager->alloc(scope, function); - return scope->d()->engine->memoryManager->alloc(scope, function, createProto); + return scope->d()->engine->memoryManager->allocObject(scope, function); + return scope->d()->engine->memoryManager->allocObject(scope, function, createProto); } Heap::FunctionObject *FunctionObject::createQmlFunction(QQmlContextData *qmlContext, QObject *scopeObject, Function *runtimeFunction, const QList &signalParameters, QString *error) @@ -309,8 +302,7 @@ ReturnedValue FunctionCtor::call(const Managed *that, CallData *callData) DEFINE_OBJECT_VTABLE(FunctionPrototype); -Heap::FunctionPrototype::FunctionPrototype(InternalClass *ic, QV4::Object *prototype) - : Heap::FunctionObject(ic, prototype) +Heap::FunctionPrototype::FunctionPrototype() { } @@ -482,7 +474,6 @@ ReturnedValue ScriptFunction::call(const Managed *that, CallData *callData) DEFINE_OBJECT_VTABLE(SimpleScriptFunction); Heap::SimpleScriptFunction::SimpleScriptFunction(QV4::ExecutionContext *scope, Function *function, bool createProto) - : Heap::FunctionObject(function->compilationUnit->engine->simpleScriptFunctionClass, function->compilationUnit->engine->functionPrototype()) { this->scope = scope->d(); diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index 73fa12dd04..182f06f74e 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -58,7 +58,7 @@ struct Q_QML_PRIVATE_EXPORT FunctionObject : Object { FunctionObject(ExecutionContext *scope, const QString &name = QString(), bool createProto = false); FunctionObject(QV4::ExecutionContext *scope, const ReturnedValue name); FunctionObject(ExecutionContext *scope, const ReturnedValue name); - FunctionObject(InternalClass *ic, QV4::Object *prototype); + FunctionObject(); ~FunctionObject(); unsigned int formalParameterCount() { return function ? function->nFormals : 0; } @@ -74,7 +74,7 @@ struct FunctionCtor : FunctionObject { }; struct FunctionPrototype : FunctionObject { - FunctionPrototype(InternalClass *ic, QV4::Object *prototype); + FunctionPrototype(); }; struct Q_QML_EXPORT BuiltinFunction : FunctionObject { @@ -115,6 +115,8 @@ struct Q_QML_EXPORT FunctionObject: Object { }; V4_OBJECT2(FunctionObject, Object) Q_MANAGED_TYPE(FunctionObject) + V4_INTERNALCLASS(functionClass) + V4_PROTOTYPE(functionPrototype) V4_NEEDS_DESTROY Heap::ExecutionContext *scope() const { return d()->scope; } @@ -180,7 +182,7 @@ struct Q_QML_EXPORT BuiltinFunction: FunctionObject { static Heap::BuiltinFunction *create(ExecutionContext *scope, String *name, ReturnedValue (*code)(CallContext *)) { - return scope->engine()->memoryManager->alloc(scope, name, code); + return scope->engine()->memoryManager->allocObject(scope, name, code); } static ReturnedValue construct(const Managed *, CallData *); @@ -210,6 +212,7 @@ Heap::IndexedBuiltinFunction::IndexedBuiltinFunction(QV4::ExecutionContext *scop struct SimpleScriptFunction: FunctionObject { V4_OBJECT2(SimpleScriptFunction, FunctionObject) + V4_INTERNALCLASS(simpleScriptFunctionClass) static ReturnedValue construct(const Managed *, CallData *callData); static ReturnedValue call(const Managed *that, CallData *callData); @@ -230,7 +233,7 @@ struct BoundFunction: FunctionObject { static Heap::BoundFunction *create(ExecutionContext *scope, FunctionObject *target, const Value &boundThis, QV4::MemberData *boundArgs) { - return scope->engine()->memoryManager->alloc(scope, target, boundThis, boundArgs); + return scope->engine()->memoryManager->allocObject(scope, target, boundThis, boundArgs); } Heap::FunctionObject *target() const { return d()->target; } diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index bfbd3431ae..f4f87f3aea 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -858,10 +858,9 @@ QString Stringify::JA(ArrayObject *a) } -Heap::JsonObject::JsonObject(ExecutionEngine *e) - : Heap::Object(e->emptyClass, e->objectPrototype()) +Heap::JsonObject::JsonObject() { - Scope scope(e); + Scope scope(internalClass->engine); ScopedObject o(scope, this); o->defineDefaultProperty(QStringLiteral("parse"), QV4::JsonObject::method_parse, 2); diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h index 1ad0e2c5de..61d44f206e 100644 --- a/src/qml/jsruntime/qv4jsonobject_p.h +++ b/src/qml/jsruntime/qv4jsonobject_p.h @@ -47,7 +47,7 @@ namespace QV4 { namespace Heap { struct JsonObject : Object { - JsonObject(ExecutionEngine *e); + JsonObject(); }; } diff --git a/src/qml/jsruntime/qv4mathobject.cpp b/src/qml/jsruntime/qv4mathobject.cpp index c498160c36..f1face007c 100644 --- a/src/qml/jsruntime/qv4mathobject.cpp +++ b/src/qml/jsruntime/qv4mathobject.cpp @@ -47,10 +47,9 @@ DEFINE_OBJECT_VTABLE(MathObject); static const double qt_PI = 2.0 * ::asin(1.0); -Heap::MathObject::MathObject(ExecutionEngine *e) - : Heap::Object(e->emptyClass, e->objectPrototype()) +Heap::MathObject::MathObject() { - Scope scope(e); + Scope scope(internalClass->engine); ScopedObject m(scope, this); m->defineReadonlyProperty(QStringLiteral("E"), Primitive::fromDouble(M_E)); diff --git a/src/qml/jsruntime/qv4mathobject_p.h b/src/qml/jsruntime/qv4mathobject_p.h index 472b2020b1..ff4fb12ee6 100644 --- a/src/qml/jsruntime/qv4mathobject_p.h +++ b/src/qml/jsruntime/qv4mathobject_p.h @@ -42,7 +42,7 @@ namespace QV4 { namespace Heap { struct MathObject : Object { - MathObject(ExecutionEngine *e); + MathObject(); }; } diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index f977b00bc3..b9d8180a26 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1726,7 +1726,7 @@ QV4::ReturnedValue CallArgument::toValue(QV4::ExecutionEngine *engine) ReturnedValue QObjectMethod::create(ExecutionContext *scope, QObject *object, int index) { Scope valueScope(scope); - Scoped method(valueScope, scope->d()->engine->memoryManager->alloc(scope)); + Scoped method(valueScope, scope->d()->engine->memoryManager->allocObject(scope)); method->d()->object = object; if (QQmlData *ddata = QQmlData::get(object)) @@ -1740,7 +1740,7 @@ ReturnedValue QObjectMethod::create(ExecutionContext *scope, QObject *object, in ReturnedValue QObjectMethod::create(ExecutionContext *scope, const QQmlValueTypeWrapper *valueType, int index) { Scope valueScope(scope); - Scoped method(valueScope, scope->d()->engine->memoryManager->alloc(scope)); + Scoped method(valueScope, scope->d()->engine->memoryManager->allocObject(scope)); method->d()->propertyCache = valueType->d()->propertyCache; method->d()->index = index; method->d()->valueTypeWrapper = *valueType; diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index da54c5572d..d122f06d05 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -1266,7 +1266,8 @@ QV4::ReturnedValue Runtime::setupArgumentsObject(ExecutionEngine *engine) { Q_ASSERT(engine->current->type == Heap::ExecutionContext::Type_CallContext); QV4::CallContext *c = static_cast(engine->currentContext); - return engine->memoryManager->alloc(c)->asReturnedValue(); + QV4::InternalClass *ic = c->d()->strictMode ? engine->strictArgumentsObjectClass : engine->argumentsObjectClass; + return engine->memoryManager->allocObject(ic, engine->objectPrototype(), c)->asReturnedValue(); } #endif // V4_BOOTSTRAP diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index a9cbb58ad6..9bb3b2b605 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -247,7 +247,7 @@ ReturnedValue Script::run() return Q_V4_PROFILE(engine, vmFunction); } else { Scoped qml(valueScope, qmlContext.value()); - ScopedFunctionObject f(valueScope, engine->memoryManager->alloc(qml, vmFunction)); + ScopedFunctionObject f(valueScope, engine->memoryManager->allocObject(qml, vmFunction)); ScopedCallData callData(valueScope); callData->thisObject = Primitive::undefinedValue(); return f->call(callData); @@ -325,7 +325,7 @@ ReturnedValue Script::qmlBinding() ExecutionEngine *v4 = scope->engine(); Scope valueScope(v4); Scoped qml(valueScope, qmlContext.value()); - ScopedObject v(valueScope, v4->memoryManager->alloc(qml, vmFunction)); + ScopedObject v(valueScope, v4->memoryManager->allocObject(qml, vmFunction)); return v.asReturnedValue(); } diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index de7741675b..c131daab32 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -2034,7 +2034,7 @@ void *qt_add_qmlxmlhttprequest(ExecutionEngine *v4) { Scope scope(v4); - Scoped ctor(scope, v4->memoryManager->alloc(v4)); + Scoped ctor(scope, v4->memoryManager->allocObject(v4)); ScopedString s(scope, v4->newString(QStringLiteral("XMLHttpRequest"))); v4->globalObject->defineReadonlyProperty(s, ctor); diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index f2f743a6cb..2d174975ec 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1262,7 +1262,7 @@ ReturnedValue QtObject::method_binding(CallContext *ctx) if (!f) V4THROW_TYPE("binding(): argument (binding expression) must be a function"); - return (ctx->d()->engine->memoryManager->alloc(f))->asReturnedValue(); + return (ctx->d()->engine->memoryManager->allocObject(f))->asReturnedValue(); } diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index e820d43efd..d384a11034 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -83,7 +83,7 @@ struct DelegateModelGroupFunction : QV4::FunctionObject static Heap::DelegateModelGroupFunction *create(QV4::ExecutionContext *scope, uint flag, QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::Value &arg)) { - return scope->engine()->memoryManager->alloc(scope, flag, code); + return scope->engine()->memoryManager->allocObject(scope, flag, code); } static QV4::ReturnedValue call(const QV4::Managed *that, QV4::CallData *callData) diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index a9e53cca6e..68f0871486 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -222,8 +222,8 @@ public: QV4::ScopedString name(scope, v4->newString(QString::fromUtf8(propertyName))); QV4::ExecutionContext *global = v4->rootContext(); - QV4::ScopedFunctionObject g(scope, v4->memoryManager->alloc(global, propertyId, QQmlDMCachedModelData::get_property)); - QV4::ScopedFunctionObject s(scope, v4->memoryManager->alloc(global, propertyId, QQmlDMCachedModelData::set_property)); + QV4::ScopedFunctionObject g(scope, v4->memoryManager->allocObject(global, propertyId, QQmlDMCachedModelData::get_property)); + QV4::ScopedFunctionObject s(scope, v4->memoryManager->allocObject(global, propertyId, QQmlDMCachedModelData::set_property)); p->setGetter(g); p->setSetter(s); proto->insertMember(name, p, QV4::Attr_Accessor|QV4::Attr_NotEnumerable|QV4::Attr_NotConfigurable); diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp index a882c5ef50..132817ff8c 100644 --- a/tools/qmljs/qmljs.cpp +++ b/tools/qmljs/qmljs.cpp @@ -188,9 +188,9 @@ int main(int argc, char *argv[]) QV4::Scope scope(&vm); QV4::ScopedContext ctx(scope, vm.rootContext()); - QV4::ScopedObject print(scope, vm.memoryManager->alloc(vm.rootContext())); + QV4::ScopedObject print(scope, vm.memoryManager->allocObject(vm.rootContext())); vm.globalObject->put(QV4::ScopedString(scope, vm.newIdentifier(QStringLiteral("print"))).getPointer(), print); - QV4::ScopedObject gc(scope, vm.memoryManager->alloc(ctx)); + QV4::ScopedObject gc(scope, vm.memoryManager->allocObject(ctx)); vm.globalObject->put(QV4::ScopedString(scope, vm.newIdentifier(QStringLiteral("gc"))).getPointer(), gc); foreach (const QString &fn, args) { -- cgit v1.2.3