]>
Commit | Line | Data |
---|---|---|
5f76c832 JB |
1 | From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | |
3 | Date: Mon, 18 Mar 2024 11:14:54 -0700 | |
4 | Subject: [PATCH] REGRESSION(274077@main): failure to build on i586 (and likely | |
5 | other 32bit arches): static assertion failed: Timer should stay small | |
6 | https://bugs.webkit.org/show_bug.cgi?id=271108 | |
7 | ||
8 | Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches | |
9 | the size of Timer on 32-bit platforms. | |
10 | ||
11 | * Source/WebCore/platform/Timer.cpp: | |
12 | ||
13 | Canonical link: https://commits.webkit.org/276282@main | |
14 | --- | |
15 | Source/WebCore/platform/Timer.cpp | 6 +++++- | |
16 | 1 file changed, 5 insertions(+), 1 deletion(-) | |
17 | ||
18 | diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp | |
19 | index 4f7c0f5c39ca9..0f3734cca2474 100644 | |
20 | --- a/Source/WebCore/platform/Timer.cpp | |
21 | +++ b/Source/WebCore/platform/Timer.cpp | |
22 | @@ -263,7 +263,11 @@ struct SameSizeAsTimer { | |
23 | ||
24 | WeakPtr<TimerAlignment> timerAlignment; | |
25 | double times[2]; | |
26 | - void* pointers[3]; | |
27 | + void* pointers[2]; | |
28 | +#if CPU(ADDRESS32) | |
29 | + uint8_t bitfields; | |
30 | +#endif | |
31 | + void* pointer; | |
32 | }; | |
33 | ||
34 | static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small"); |