diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-10-11 22:02:38 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-12 09:22:13 +0200 |
commit | 6dc9647e537f2a354ab03d5276eb2a65e863702d (patch) | |
tree | d45c34cf19a151f740526ddfcf8876a3d1606193 /src/qml/jsruntime | |
parent | 28f67263a181e2d99b2c240f9d698bf64100ac92 (diff) |
Remove some unused flags from Managed
Change-Id: I94399489823d5b0d4d40f300e1999272dc2da5c9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 5 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4functionobject_p.h | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4globalobject.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 8 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 2 |
5 files changed, 3 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index e67b3ef771..8faf2a74b6 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -115,7 +115,6 @@ FunctionObject::FunctionObject(InternalClass *ic) type = Type_FunctionObject; needsActivation = false; - usesArgumentsObject = false; strictMode = false; } @@ -135,7 +134,6 @@ void FunctionObject::init(const StringRef n, bool createProto) type = Type_FunctionObject; needsActivation = true; - usesArgumentsObject = false; strictMode = false; #ifndef QT_NO_DEBUG assert(scope->next != (ExecutionContext *)0x1); @@ -414,7 +412,6 @@ ScriptFunction::ScriptFunction(ExecutionContext *scope, Function *function) ExecutionEngine *v4 = scope->engine; needsActivation = function->needsActivation(); - usesArgumentsObject = function->usesArgumentsObject(); strictMode = function->isStrict(); formalParameterCount = function->formals.size(); formalParameterList = function->formals.constData(); @@ -511,7 +508,6 @@ SimpleScriptFunction::SimpleScriptFunction(ExecutionContext *scope, Function *fu ExecutionEngine *v4 = scope->engine; needsActivation = function->needsActivation(); - usesArgumentsObject = function->usesArgumentsObject(); strictMode = function->isStrict(); formalParameterCount = function->formals.size(); formalParameterList = function->formals.constData(); @@ -596,7 +592,6 @@ BuiltinFunction::BuiltinFunction(ExecutionContext *scope, const StringRef name, , code(code) { vtbl = &static_vtbl; - isBuiltinFunction = true; } ReturnedValue BuiltinFunction::construct(Managed *f, CallData *) diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index 24231165df..eeb041ddc0 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -193,7 +193,6 @@ struct IndexedBuiltinFunction: FunctionObject , index(index) { vtbl = &static_vtbl; - isBuiltinFunction = true; } static ReturnedValue construct(Managed *m, CallData *) diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index e1e986e85f..390fffff8a 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -386,7 +386,6 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) strictMode = function->isStrict() || (ctx->strictMode); - usesArgumentsObject = function->usesArgumentsObject(); needsActivation = function->needsActivation(); if (strictMode) { diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index d189c1961b..e77c724994 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -289,15 +289,13 @@ public: uint inUse : 1; uint extensible : 1; // used by Object uint isNonStrictArgumentsObject : 1; - uint isBuiltinFunction : 1; // used by FunctionObject uint needsActivation : 1; // used by FunctionObject - uint usesArgumentsObject : 1; // used by FunctionObject uint strictMode : 1; // used by FunctionObject - uint type : 8; - mutable uint subtype : 3; uint bindingKeyFlag : 1; uint hasAccessorProperty : 1; - uint unused : 11; + uint type : 8; + mutable uint subtype : 8; + uint unused : 8; }; }; diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 4081be54e8..885ea8ea76 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -66,7 +66,6 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, Function *f, Objec vtbl = &static_vtbl; function = f; function->compilationUnit->ref(); - usesArgumentsObject = function->usesArgumentsObject(); needsActivation = function->needsActivation(); defineReadonlyProperty(scope->engine->id_length, Primitive::fromInt32(1)); @@ -80,7 +79,6 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, ObjectRef qml) { vtbl = &static_vtbl; function = 0; - usesArgumentsObject = false; needsActivation = false; defineReadonlyProperty(scope->engine->id_length, Primitive::fromInt32(1)); |