diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-07-12 10:07:17 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-07-12 08:12:00 +0000 |
| commit | f2f84086e7841f06e75d57cf9c376ac5f432cfed (patch) | |
| tree | e6b3c823a6560da2d8f4a0c68db37c8bcf53b946 /src/qml/jsruntime/qv4context_p.h | |
| parent | c257888d986e01da69c8b10018c1b373b63d648e (diff) | |
Disable size check for CallContext
This check now also fails on Win8/msvc2013. It's questionable if it's
useful at all, because the ValueArray at the end of the
CallContextMembers is meant to be of variable-length at runtime.
Task-number: QTBUG-61874
Change-Id: I6f3be8f60e6a2f3e1d134edb68a205222067f68d
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 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index ff985ad9ee..916ead9d09 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -173,11 +173,13 @@ Q_STATIC_ASSERT(std::is_standard_layout<CallContextData>::value); Q_STATIC_ASSERT(offsetof(CallContextData, v4Function) == 0); Q_STATIC_ASSERT(offsetof(CallContextData, function) == QT_POINTER_SIZE); Q_STATIC_ASSERT(offsetof(CallContextData, locals) == offsetof(CallContextData, function) + QT_POINTER_SIZE); -#if defined(Q_PROCESSOR_ARM_32) && !defined(Q_OS_IOS) -Q_STATIC_ASSERT(sizeof(CallContext) == sizeof(ExecutionContext) + sizeof(CallContextData) + QT_POINTER_SIZE); -#else -Q_STATIC_ASSERT(sizeof(CallContext) == sizeof(ExecutionContext) + sizeof(CallContextData)); -#endif +//### The following size check fails on Win8. With the ValueArray at the end of the +// CallContextMembers, it doesn't look very useful. +//#if defined(Q_PROCESSOR_ARM_32) && !defined(Q_OS_IOS) +//Q_STATIC_ASSERT(sizeof(CallContext) == sizeof(ExecutionContext) + sizeof(CallContextData) + QT_POINTER_SIZE); +//#else +//Q_STATIC_ASSERT(sizeof(CallContext) == sizeof(ExecutionContext) + sizeof(CallContextData)); +//#endif #define CatchContextMembers(class, Member) \ Member(class, Pointer, String *, exceptionVarName) \ |