Title: [235740] trunk/Source/_javascript_Core
- Revision
- 235740
- Author
- tpop...@redhat.com
- Date
- 2018-09-06 09:41:32 -0700 (Thu, 06 Sep 2018)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (235739 => 235740)
--- trunk/Source/_javascript_Core/ChangeLog 2018-09-06 16:12:00 UTC (rev 235739)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-09-06 16:41:32 UTC (rev 235740)
@@ -1,3 +1,15 @@
+2018-09-06 Tomas Popela <tpop...@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....@apple.com>
JSPropertyNameEnumerator::visitChildren() needs to visit its m_cachedStructureID.
Modified: trunk/Source/_javascript_Core/heap/RegisterState.h (235739 => 235740)
--- trunk/Source/_javascript_Core/heap/RegisterState.h 2018-09-06 16:12:00 UTC (rev 235739)
+++ trunk/Source/_javascript_Core/heap/RegisterState.h 2018-09-06 16:41:32 UTC (rev 235740)
@@ -166,7 +166,7 @@
#pragma warning(disable: 4611)
#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)
#if COMPILER(MSVC)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
