diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-07-12 17:44:29 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-07-17 08:48:14 +0000 |
| commit | a2efb8d94bb8e860d8616f56c4f40e7c41eb3810 (patch) | |
| tree | 81084652842a16057f92dbcbc3df5c0b119e38ac /src | |
| parent | 51a614a419e9745d275793e36b6aab295bf1e8e3 (diff) | |
wasm: fix unicode toUpper issueswip/webassembly
see https://github.com/kripken/emscripten/issues/4540
On large bitfields, emscripten creates types such as
i472, which 'legalization passes don't know how to
convert into legal code'
Adding a dummy field every 64 bits forces alignment
which in turn forces emscripten to create i64 types
instead.
Task-number: QTBUG-66621
Task-number: QTBUG-69421
Change-Id: I5bfd2079ac8f35ced8b59a1d2e3c657993a70986
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qunicodetables_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index f3fb6ec1b0..3f2e91a9b2 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -72,6 +72,9 @@ struct Properties { signed short mirrorDiff : 16; ushort lowerCaseSpecial : 1; signed short lowerCaseDiff : 15; +#ifdef Q_OS_WASM + unsigned char : 0; //wasm 64 packing trick +#endif ushort upperCaseSpecial : 1; signed short upperCaseDiff : 15; ushort titleCaseSpecial : 1; @@ -80,6 +83,9 @@ struct Properties { signed short caseFoldDiff : 15; ushort unicodeVersion : 8; /* 5 used */ ushort nfQuickCheck : 8; +#ifdef Q_OS_WASM + unsigned char : 0; //wasm 64 packing trick +#endif ushort graphemeBreakClass : 5; /* 5 used */ ushort wordBreakClass : 5; /* 5 used */ ushort sentenceBreakClass : 8; /* 4 used */ |