diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-08-06 14:55:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-08-10 14:16:09 +0000 |
| commit | 18d2f78437d28987297148b63b99ceed6313a78a (patch) | |
| tree | 845e016b002a123e394df43fcf88cf2dc7ee1fb6 /src/qml/jsruntime/qv4enginebase_p.h | |
| parent | 577630fe4a1f6a129239788080ff9e802118fd26 (diff) | |
Update Yarr to the latest version from WebKit
Updated Yarr to a to commit
4d2a53d60487cb1f8b2a9a1e9f684af336fd7d2c in WebKit.
Adjusted the yarr code base to work with our older version of
wtf and masm.
Change-Id: I04b4593ece051e1d7aa087b87aa08c92595d1098
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4enginebase_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4enginebase_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h index 3e89e57abb..189208e731 100644 --- a/src/qml/jsruntime/qv4enginebase_p.h +++ b/src/qml/jsruntime/qv4enginebase_p.h @@ -72,9 +72,8 @@ struct Q_QML_EXPORT EngineBase { quint8 hasException = false; quint8 writeBarrierActive = false; quint16 unused = 0; -#if QT_POINTER_SIZE == 8 - quint8 padding[4]; -#endif + quint8 isExecutingInRegExpJIT = false; + quint8 padding[3]; MemoryManager *memoryManager = nullptr; Runtime runtime; @@ -133,7 +132,7 @@ Q_STATIC_ASSERT(std::is_standard_layout<EngineBase>::value); Q_STATIC_ASSERT(offsetof(EngineBase, currentStackFrame) == 0); Q_STATIC_ASSERT(offsetof(EngineBase, jsStackTop) == offsetof(EngineBase, currentStackFrame) + QT_POINTER_SIZE); Q_STATIC_ASSERT(offsetof(EngineBase, hasException) == offsetof(EngineBase, jsStackTop) + QT_POINTER_SIZE); -Q_STATIC_ASSERT(offsetof(EngineBase, memoryManager) == offsetof(EngineBase, hasException) + QT_POINTER_SIZE); +Q_STATIC_ASSERT(offsetof(EngineBase, memoryManager) == offsetof(EngineBase, hasException) + 8); Q_STATIC_ASSERT(offsetof(EngineBase, runtime) == offsetof(EngineBase, memoryManager) + QT_POINTER_SIZE); } |