diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-10-23 10:10:28 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-13 08:56:04 +0000 |
| commit | a2142203ad6cdb54ec063e259b40171e13c5d4bd (patch) | |
| tree | 5da2bc88d9015b5f938e7dcd118bd9c5a93c3e5c /src/qml/jsruntime/qv4context_p.h | |
| parent | 4d2763e425828ac35c2a03c0e675b83fa8dad668 (diff) | |
Finally get rid of the QV4::Function pointer in the context
Change-Id: Iad6018f67faa956d385087865fca9d73419e363e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4context_p.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 7ed3320f8a..34a406e8e0 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -117,8 +117,7 @@ struct QmlContext; #define ExecutionContextMembers(class, Member) \ Member(class, Pointer, ExecutionContext *, outer) \ - Member(class, Pointer, Object *, activation) \ - Member(class, NoMark, QV4::Function *, v4Function) \ + Member(class, Pointer, Object *, activation) DECLARE_HEAP_OBJECT(ExecutionContext, Base) { DECLARE_MARK_TABLE(ExecutionContext); @@ -150,7 +149,6 @@ Q_STATIC_ASSERT(sizeof(ExecutionContext) == sizeof(Base) + sizeof(ExecutionConte Q_STATIC_ASSERT(std::is_standard_layout<ExecutionContextData>::value); Q_STATIC_ASSERT(offsetof(ExecutionContextData, outer) == 0); Q_STATIC_ASSERT(offsetof(ExecutionContextData, activation) == offsetof(ExecutionContextData, outer) + QT_POINTER_SIZE); -Q_STATIC_ASSERT(offsetof(ExecutionContextData, v4Function) == offsetof(ExecutionContextData, activation) + QT_POINTER_SIZE); #define CallContextMembers(class, Member) \ Member(class, Pointer, FunctionObject *, function) \ @@ -171,8 +169,6 @@ DECLARE_HEAP_OBJECT(CallContext, ExecutionContext) { return locals.data() + locals.size; } void setArg(uint index, Value v); - - inline unsigned int formalParameterCount() const; }; V4_ASSERT_IS_TRIVIAL(CallContext) Q_STATIC_ASSERT(std::is_standard_layout<CallContextData>::value); @@ -228,9 +224,6 @@ struct Q_QML_EXPORT ExecutionContext : public Managed inline CallContext *asCallContext(); inline const CallContext *asCallContext() const; - - Function *getFunction() const; - }; struct Q_QML_EXPORT CallContext : public ExecutionContext |