Changeset 235740 in webkit

Timestamp:

Sep 6, 2018, 9:41:32 AM (8 years ago)

Author:

tpopela@redhat.com

Message:

[JSC] Build broken after r234975 on s390x, ppc64le, armv7hl
​https://bugs.webkit.org/show_bug.cgi?id=189078

Reviewed by Mark Lam.

Caused by the GCC bug - ​https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70124.
Using the ternary operator instead of std::max() fixes it.

• heap/RegisterState.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/RegisterState.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-09-06  Tomas Popela  <tpopela@redhat.com>
+
+        [JSC] Build broken after r234975 on s390x, ppc64le, armv7hl
+        https://bugs.webkit.org/show_bug.cgi?id=189078
+
+        Reviewed by Mark Lam.
+
+        Caused by the GCC bug - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70124.
+        Using the ternary operator instead of std::max() fixes it.
+
+        * heap/RegisterState.h:
+
 2018-09-05  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/heap/RegisterState.h

@@ -167 +167 @@
 #endif
 #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
-    alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \
+    alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \
     setjmp(registers)