aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4context.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-31 15:35:20 +0200
committerLars Knoll <lars.knoll@qt.io>2017-09-02 07:12:22 +0000
commit020ad3d259f57c379fbcdd4e69c235dd1b0a3774 (patch)
tree170e5199a8b7327ca7f46eccf557e5803224c488 /src/qml/jsruntime/qv4context.cpp
parent74c8fe86755af485f8d0a47799d6d50f00070f05 (diff)
Get rid of the hack for named expressions
Instead simply use the pointer to the FunctionObject we have in the CallData now. Change-Id: I6d7ed8af22e89e0217bef427110611b661ac7965 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
-rw-r--r--src/qml/jsruntime/qv4context.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index d672df40e8..6de6424f0e 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -287,11 +287,6 @@ ReturnedValue ExecutionContext::getProperty(String *name)
uint index = c->internalClass->find(id);
if (index < UINT_MAX)
return c->locals[index].asReturnedValue();
- if (c->v4Function->isNamedExpression()) {
- Scope scope(this);
- if (c->function && name->equals(ScopedString(scope, c->v4Function->name())))
- return c->function->asReturnedValue();
- }
Q_FALLTHROUGH();
}
case Heap::ExecutionContext::Type_WithContext:
@@ -334,11 +329,6 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Value *base)
uint index = c->internalClass->find(id);
if (index < UINT_MAX)
return c->locals[index].asReturnedValue();
- if (c->v4Function->isNamedExpression()) {
- Scope scope(this);
- if (c->function && name->equals(ScopedString(scope, c->v4Function->name())))
- return c->function->asReturnedValue();
- }
Q_FALLTHROUGH();
}
case Heap::ExecutionContext::Type_GlobalContext: {