diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-03-03 11:51:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 20:23:24 +0100 |
| commit | 292fdc90865e8603e11bbbe3f2870004caeb0e35 (patch) | |
| tree | 964cfe2ea959c1159618356ce8d99c6f1db03ff1 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | fd8981d835f298306a39c5d32b1050bf8f9b5653 (diff) | |
Remove nArguments and name from QV4::Function
Saves 12 bytes per Function
Change-Id: I9a495805f9201eb6162a520ff5c2defeb73dc37a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 66e956e43c..e8a442faca 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -177,8 +177,6 @@ void FunctionObject::markObjects(Managed *that, ExecutionEngine *e) // for (uint i = 0; i < varCount; ++i) // varList[i]->mark(); o->scope->mark(e); - if (o->function) - o->function->mark(e); Object::markObjects(that, e); } @@ -398,7 +396,7 @@ ReturnedValue FunctionPrototype::method_bind(CallContext *ctx) DEFINE_OBJECT_VTABLE(ScriptFunction); ScriptFunction::ScriptFunction(ExecutionContext *scope, Function *function) - : FunctionObject(scope, function->name, true) + : FunctionObject(scope, function->name(), true) { setVTable(staticVTable()); @@ -418,8 +416,8 @@ ScriptFunction::ScriptFunction(ExecutionContext *scope, Function *function) needsActivation = function->needsActivation(); strictMode = function->isStrict(); - formalParameterCount = function->nArguments; - varCount = function->internalClass->size - function->nArguments; + formalParameterCount = function->compiledFunction->nFormals; + varCount = function->internalClass->size - function->compiledFunction->nFormals; defineReadonlyProperty(scope->engine->id_length, Primitive::fromInt32(formalParameterCount)); @@ -483,7 +481,7 @@ ReturnedValue ScriptFunction::call(Managed *that, CallData *callData) DEFINE_OBJECT_VTABLE(SimpleScriptFunction); SimpleScriptFunction::SimpleScriptFunction(ExecutionContext *scope, Function *function, bool createProto) - : FunctionObject(scope, function->name, createProto) + : FunctionObject(scope, function->name(), createProto) { setVTable(staticVTable()); @@ -503,8 +501,8 @@ SimpleScriptFunction::SimpleScriptFunction(ExecutionContext *scope, Function *fu needsActivation = function->needsActivation(); strictMode = function->isStrict(); - formalParameterCount = function->nArguments; - varCount = function->internalClass->size - function->nArguments; + formalParameterCount = function->compiledFunction->nFormals; + varCount = function->internalClass->size - function->compiledFunction->nFormals; defineReadonlyProperty(scope->engine->id_length, Primitive::fromInt32(formalParameterCount)); |