aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4context.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-08 21:55:06 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-10 08:19:34 +0000
commitd5cacaf6b2adb269b9e24b518e1496bca935bc34 (patch)
treee95631610e46956f24aa6284526645a25b86ab9a /src/qml/jsruntime/qv4context.cpp
parent7c0dbaa3db649fb348af533820ac0550bc144d96 (diff)
Remove stuff related to simple call contexts
Those are not being used anymore. Change-Id: Ia33dd7c3c7ea7828caef0fbf397253249580a4e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
-rw-r--r--src/qml/jsruntime/qv4context.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index f82ea74227..0bcc864b85 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -65,7 +65,7 @@ Heap::CallContext *ExecutionContext::newCallContext(Heap::ExecutionContext *oute
ExecutionEngine *v4 = outer->internalClass->engine;
Heap::CallContext *c = v4->memoryManager->allocManaged<CallContext>(requiredMemory, function->internalClass);
- c->init(Heap::ExecutionContext::Type_CallContext);
+ c->init();
c->v4Function = function;
@@ -118,7 +118,6 @@ void ExecutionContext::createMutableBinding(String *name, bool deletable)
while (ctx) {
switch (ctx->d()->type) {
case Heap::ExecutionContext::Type_CallContext:
- case Heap::ExecutionContext::Type_SimpleCallContext:
if (!activation) {
Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx->d());
if (!c->activation)
@@ -209,8 +208,7 @@ bool ExecutionContext::deleteProperty(String *name)
Q_FALLTHROUGH();
}
case Heap::ExecutionContext::Type_WithContext:
- case Heap::ExecutionContext::Type_GlobalContext:
- case Heap::ExecutionContext::Type_SimpleCallContext: {
+ case Heap::ExecutionContext::Type_GlobalContext: {
if (ctx->activation) {
Scope scope(this);
ScopedObject object(scope, ctx->activation);
@@ -281,8 +279,7 @@ bool ExecutionContext::setProperty(String *name, const Value &value)
return w->put(name, value);
break;
}
- case Heap::ExecutionContext::Type_CallContext:
- case Heap::ExecutionContext::Type_SimpleCallContext: {
+ case Heap::ExecutionContext::Type_CallContext: {
Heap::CallContext *c = static_cast<Heap::CallContext *>(ctx);
if (c->v4Function) {
uint index = c->internalClass->find(id);
@@ -357,8 +354,7 @@ ReturnedValue ExecutionContext::getProperty(String *name)
}
case Heap::ExecutionContext::Type_WithContext:
case Heap::ExecutionContext::Type_GlobalContext:
- case Heap::ExecutionContext::Type_QmlContext:
- case Heap::ExecutionContext::Type_SimpleCallContext: {
+ case Heap::ExecutionContext::Type_QmlContext: {
if (ctx->activation) {
Scope scope(this);
ScopedObject activation(scope, ctx->activation);
@@ -406,8 +402,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Value *base)
}
Q_FALLTHROUGH();
}
- case Heap::ExecutionContext::Type_GlobalContext:
- case Heap::ExecutionContext::Type_SimpleCallContext: {
+ case Heap::ExecutionContext::Type_GlobalContext: {
if (ctx->activation) {
Scope scope(this);
ScopedObject activation(scope, ctx->activation);