diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-03 12:00:19 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-03 10:21:56 +0000 |
| commit | 1f8ab5fa975b2ec9172090f5665bb77cc5630584 (patch) | |
| tree | 98f37fba9cb0e5553d1cdbdc5448aa633336bdf0 /src/qml/jsruntime/qv4context.cpp | |
| parent | 348f24532f2b6b34eebd15207da0c510d6f499d0 (diff) | |
Unify QV4::Function::internalClass and the ic used in CallContext
Set the internal class of the V4 function on the CallContext, as
that one is describing it's layout, and use it to lookup
variables.
Change-Id: I49d9b9afe1f504fbd059d6a350b7a4e62e2e505b
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 5f552b5515..9fd05aad38 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -63,7 +63,7 @@ Heap::CallContext *ExecutionContext::newCallContext(Function *function, CallData size_t requiredMemory = sizeof(CallContext::Data) - sizeof(Value) + sizeof(Value) * (localsAndFormals); ExecutionEngine *v4 = engine(); - Heap::CallContext *c = v4->memoryManager->allocManaged<CallContext>(requiredMemory); + Heap::CallContext *c = v4->memoryManager->allocManaged<CallContext>(requiredMemory, function->internalClass); c->init(Heap::ExecutionContext::Type_CallContext); c->v4Function = function; @@ -177,7 +177,7 @@ void Heap::CatchContext::init(ExecutionContext *outerContext, String *exceptionV Identifier * const *CallContext::formals() const { - return d()->v4Function ? d()->v4Function->internalClass->nameMap.constData() : 0; + return d()->v4Function ? d()->internalClass->nameMap.constData() : 0; } unsigned int CallContext::formalCount() const @@ -187,7 +187,7 @@ unsigned int CallContext::formalCount() const Identifier * const *CallContext::variables() const { - return d()->v4Function ? d()->v4Function->internalClass->nameMap.constData() + d()->v4Function->nFormals : 0; + return d()->v4Function ? d()->internalClass->nameMap.constData() + d()->v4Function->nFormals : 0; } unsigned int CallContext::variableCount() const @@ -214,7 +214,7 @@ bool ExecutionContext::deleteProperty(String *name) } case Heap::ExecutionContext::Type_CallContext: { Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx->d()); - uint index = c->v4Function->internalClass->find(id); + uint index = c->internalClass->find(id); if (index < UINT_MAX) // ### throw in strict mode? return false; @@ -317,7 +317,7 @@ void ExecutionContext::setProperty(String *name, const Value &value) case Heap::ExecutionContext::Type_SimpleCallContext: { Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx->d()); if (c->v4Function) { - uint index = c->v4Function->internalClass->find(id); + uint index = c->internalClass->find(id); if (index < UINT_MAX) { if (index < c->v4Function->nFormals) { c->callData->args[c->v4Function->nFormals - index - 1] = value; @@ -381,7 +381,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) name->makeIdentifier(); Identifier *id = name->identifier(); - uint index = c->v4Function->internalClass->find(id); + uint index = c->internalClass->find(id); if (index < UINT_MAX) { if (index < c->v4Function->nFormals) return c->callData->args[c->v4Function->nFormals - index - 1].asReturnedValue(); @@ -437,7 +437,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Value *base) name->makeIdentifier(); Identifier *id = name->identifier(); - uint index = c->v4Function->internalClass->find(id); + uint index = c->internalClass->find(id); if (index < UINT_MAX) { if (index < c->v4Function->nFormals) return c->callData->args[c->v4Function->nFormals - index - 1].asReturnedValue(); |