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