1From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 2From: Michael Catanzaro <mcatanzaro@redhat.com> 3Date: Mon, 18 Mar 2024 11:14:54 -0700 4Subject: [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 8Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches 9the size of Timer on 32-bit platforms. 10 11* Source/WebCore/platform/Timer.cpp: 12 13Canonical link: https://commits.webkit.org/276282@main 14 15Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4] 16 17Signed-off-by: Markus Volk <f_l_k@t-online.de> 18--- 19 Source/WebCore/platform/Timer.cpp | 6 +++++- 20 1 file changed, 5 insertions(+), 1 deletion(-) 21 22diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp 23index 4f7c0f5c39ca9..0f3734cca2474 100644 24--- a/Source/WebCore/platform/Timer.cpp 25+++ b/Source/WebCore/platform/Timer.cpp 26@@ -263,7 +263,11 @@ struct SameSizeAsTimer { 27 28 WeakPtr<TimerAlignment> timerAlignment; 29 double times[2]; 30- void* pointers[3]; 31+ void* pointers[2]; 32+#if CPU(ADDRESS32) 33+ uint8_t bitfields; 34+#endif 35+ void* pointer; 36 }; 37 38 static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small"); 39