Title: [230403] trunk/Source/_javascript_Core
Revision
230403
Author
utatane....@gmail.com
Date
2018-04-09 04:28:02 -0700 (Mon, 09 Apr 2018)

Log Message

Unreviewed, attempt to fix Windows build
https://bugs.webkit.org/show_bug.cgi?id=183508

* jit/JIT.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (230402 => 230403)


--- trunk/Source/_javascript_Core/ChangeLog	2018-04-09 10:53:36 UTC (rev 230402)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-04-09 11:28:02 UTC (rev 230403)
@@ -1,5 +1,12 @@
 2018-04-08  Yusuke Suzuki  <utatane....@gmail.com>
 
+        Unreviewed, attempt to fix Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=183508
+
+        * jit/JIT.h:
+
+2018-04-08  Yusuke Suzuki  <utatane....@gmail.com>
+
         Unreviewed, build fix for Windows by suppressing padding warning for JIT
         https://bugs.webkit.org/show_bug.cgi?id=183508
 

Modified: trunk/Source/_javascript_Core/jit/JIT.h (230402 => 230403)


--- trunk/Source/_javascript_Core/jit/JIT.h	2018-04-09 10:53:36 UTC (rev 230402)
+++ trunk/Source/_javascript_Core/jit/JIT.h	2018-04-09 11:28:02 UTC (rev 230403)
@@ -27,6 +27,14 @@
 
 #if ENABLE(JIT)
 
+// We've run into some problems where changing the size of the class JIT leads to
+// performance fluctuations. Try forcing alignment in an attempt to stabilize this.
+#if COMPILER(GCC_OR_CLANG)
+#define JIT_CLASS_ALIGNMENT alignas(32)
+#else
+#define JIT_CLASS_ALIGNMENT
+#endif
+
 #define ASSERT_JIT_OFFSET(actual, expected) ASSERT_WITH_MESSAGE(actual == expected, "JIT Offset \"%s\" should be %d, not %d.\n", #expected, static_cast<int>(expected), static_cast<int>(actual));
 
 #include "CodeBlock.h"
@@ -168,13 +176,7 @@
 
     void ctiPatchCallByReturnAddress(ReturnAddressPtr, FunctionPtr newCalleeFunction);
 
-    // We've run into some problems where changing the size of the class JIT leads to
-    // performance fluctuations. Try forcing alignment in an attempt to stabilize this.
-#if COMPILER(MSVC)
-#pragma warning(push)
-#pragma warning(disable: 4324) // Disable "structure was padded due to alignment specifier" warning
-#endif
-    class alignas(32) JIT : private JSInterfaceJIT {
+    class JIT_CLASS_ALIGNMENT JIT : private JSInterfaceJIT {
         friend class JITSlowPathCall;
         friend class JITStubCall;
 
@@ -947,9 +949,6 @@
         bool m_shouldUseIndexMasking;
         unsigned m_loopOSREntryBytecodeOffset { 0 };
     };
-#if COMPILER(MSVC)
-#pragma warning(pop)
-#endif
 
 } // namespace JSC
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to