Title: [235049] releases/WebKitGTK/webkit-2.22/Source/_javascript_Core
Revision
235049
Author
[email protected]
Date
2018-08-20 04:12:26 -0700 (Mon, 20 Aug 2018)

Log Message

Merge r234975 - [JSC] alignas for RegisterState should respect alignof(RegisterState) too
https://bugs.webkit.org/show_bug.cgi?id=188686

Reviewed by Saam Barati.

RegisterState would have larger alignment than `alignof(void*)`. We use the larger alignment value
for `alignof` for RegisterState.

* heap/RegisterState.h:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog (235048 => 235049)


--- releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog	2018-08-20 11:12:21 UTC (rev 235048)
+++ releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog	2018-08-20 11:12:26 UTC (rev 235049)
@@ -1,3 +1,15 @@
+2018-08-16  Yusuke Suzuki  <[email protected]>
+
+        [JSC] alignas for RegisterState should respect alignof(RegisterState) too
+        https://bugs.webkit.org/show_bug.cgi?id=188686
+
+        Reviewed by Saam Barati.
+
+        RegisterState would have larger alignment than `alignof(void*)`. We use the larger alignment value
+        for `alignof` for RegisterState.
+
+        * heap/RegisterState.h:
+
 2018-08-14  Yusuke Suzuki  <[email protected]>
 
         [YARR] Align allocation size in BumpPointerAllocator with sizeof(void*)

Modified: releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/heap/RegisterState.h (235048 => 235049)


--- releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/heap/RegisterState.h	2018-08-20 11:12:21 UTC (rev 235048)
+++ releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/heap/RegisterState.h	2018-08-20 11:12:26 UTC (rev 235049)
@@ -164,14 +164,13 @@
 #if COMPILER(MSVC)
 #pragma warning(push)
 #pragma warning(disable: 4611)
+#endif
 #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
-    alignas(void*) RegisterState registers; \
+    alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \
     setjmp(registers)
+
+#if COMPILER(MSVC)
 #pragma warning(pop)
-#else
-#define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
-    alignas(void*) RegisterState registers; \
-    setjmp(registers)
 #endif
 #endif // ALLOCATE_AND_GET_REGISTER_STATE
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to