diff options
| author | Janne Koskinen <janne.p.koskinen@qt.io> | 2018-11-06 12:31:11 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-07 15:59:07 +0000 |
| commit | 7748d3ca4671edf3b99fcbe7e35f23a747bba191 (patch) | |
| tree | 036d5f7f2eceb9a05ec9a7abb784a1119b5f8338 /src/3rdparty | |
| parent | 53440d6844a712e6675e084ada8a196ed6555aa1 (diff) | |
INTEGRITY: Fix build failure
Change-Id: Ibdf441d8c73b507a404391f82695d7a99eb3c6ca
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrJIT.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index ce7c7163ed..9a9ab581e8 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -177,11 +177,21 @@ class YarrGenerator : private DefaultMacroAssembler { uint32_t begin; uint32_t matchAmount; uintptr_t returnAddress; +#if OS(INTEGRITY) + union { + struct Subpatterns { + unsigned start; + unsigned end; + } subpatterns[1]; + uintptr_t frameSlots[1]; + }; +#else struct Subpatterns { unsigned start; unsigned end; } subpatterns[0]; uintptr_t frameSlots[0]; +#endif static size_t sizeFor(ParenContextSizes& parenContextSizes) { |