Attachment 348487 Details for Bug 189078 – Patch

[patch] Patch

bug-189078-20180830082017.patch (text/plain), 1.40 KB, created by Tomas Popela on 2018-08-29 23:20:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Popela

Created: 2018-08-29 23:20:18 PDT

Size: 1.40 KB

patch

obsolete

>Subversion Revision: 235459
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 57b4e9434dc36df89192ade06ac34fd9f1b4bb43..5cfb281619c4898b2d19d350c1d2c8a43b6b209a 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-29  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 NOBODY (OOPS!).
>+
>+        Use ternary operator instead of std::max().
>+
>+        * heap/RegisterState.h:
>+
> 2018-08-28  Mark Lam  <mark.lam@apple.com>
> 
>         Fix bit-rotted Interpreter::dumpRegisters() and move it to the VMInspector.
>diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h
>index baaef4c7857be85413804448ec87951db3f20989..b3037dba18cf4d9bc5ab5c25168d7670a5731d29 100644
>--- a/Source/JavaScriptCore/heap/RegisterState.h
>+++ b/Source/JavaScriptCore/heap/RegisterState.h
>@@ -166,7 +166,7 @@ using RegisterState = jmp_buf;
> #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)

Flags:

mark.lam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189078: 348487