Title: [230070] trunk/Source
Revision
230070
Author
commit-qu...@webkit.org
Date
2018-03-29 00:34:58 -0700 (Thu, 29 Mar 2018)

Log Message

Unreviewed, rolling out r230062.
https://bugs.webkit.org/show_bug.cgi?id=184128

Broke mac port. web content process crashes while loading any
web page (Requested by rniwa on #webkit).

Reverted changeset:

"MSVC __forceinline slows down JSC release build fivefold
after r229391"
https://bugs.webkit.org/show_bug.cgi?id=184062
https://trac.webkit.org/changeset/230062

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (230069 => 230070)


--- trunk/Source/_javascript_Core/ChangeLog	2018-03-29 06:49:27 UTC (rev 230069)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-03-29 07:34:58 UTC (rev 230070)
@@ -1,3 +1,18 @@
+2018-03-29  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r230062.
+        https://bugs.webkit.org/show_bug.cgi?id=184128
+
+        Broke mac port. web content process crashes while loading any
+        web page (Requested by rniwa on #webkit).
+
+        Reverted changeset:
+
+        "MSVC __forceinline slows down JSC release build fivefold
+        after r229391"
+        https://bugs.webkit.org/show_bug.cgi?id=184062
+        https://trac.webkit.org/changeset/230062
+
 2018-03-28  Ross Kirsling  <ross.kirsl...@sony.com>
 
         MSVC __forceinline slows down JSC release build fivefold after r229391

Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (230069 => 230070)


--- trunk/Source/_javascript_Core/jit/CCallHelpers.h	2018-03-29 06:49:27 UTC (rev 230069)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h	2018-03-29 07:34:58 UTC (rev 230070)
@@ -295,9 +295,8 @@
 
 #if USE(JSVALUE64)
 
-    // Avoid MSVC optimization time explosion associated with __forceinline in recursive templates.
     template<typename OperationType, unsigned numGPRArgs, unsigned numGPRSources, unsigned numFPRArgs, unsigned numFPRSources, unsigned extraPoke, typename RegType, typename... Args>
-    ALWAYS_INLINE_EXCEPT_MSVC void marshallArgumentRegister(ArgCollection<numGPRArgs, numGPRSources, numFPRArgs, numFPRSources, extraPoke> argSourceRegs, RegType arg, Args... args)
+    ALWAYS_INLINE void marshallArgumentRegister(ArgCollection<numGPRArgs, numGPRSources, numFPRArgs, numFPRSources, extraPoke> argSourceRegs, RegType arg, Args... args)
     {
         using InfoType = InfoTypeForReg<RegType>;
         unsigned numArgRegisters = InfoType::numberOfArgumentRegisters;

Modified: trunk/Source/WTF/ChangeLog (230069 => 230070)


--- trunk/Source/WTF/ChangeLog	2018-03-29 06:49:27 UTC (rev 230069)
+++ trunk/Source/WTF/ChangeLog	2018-03-29 07:34:58 UTC (rev 230070)
@@ -1,3 +1,18 @@
+2018-03-29  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r230062.
+        https://bugs.webkit.org/show_bug.cgi?id=184128
+
+        Broke mac port. web content process crashes while loading any
+        web page (Requested by rniwa on #webkit).
+
+        Reverted changeset:
+
+        "MSVC __forceinline slows down JSC release build fivefold
+        after r229391"
+        https://bugs.webkit.org/show_bug.cgi?id=184062
+        https://trac.webkit.org/changeset/230062
+
 2018-03-28  Ross Kirsling  <ross.kirsl...@sony.com>
 
         MSVC __forceinline slows down JSC release build fivefold after r229391

Modified: trunk/Source/WTF/wtf/Compiler.h (230069 => 230070)


--- trunk/Source/WTF/wtf/Compiler.h	2018-03-29 06:49:27 UTC (rev 230069)
+++ trunk/Source/WTF/wtf/Compiler.h	2018-03-29 07:34:58 UTC (rev 230070)
@@ -178,13 +178,6 @@
 #define ALWAYS_INLINE inline
 #endif
 
-// Sometimes needed due to MSVC optimizer sensitivities.
-#if COMPILER(MSVC)
-#define ALWAYS_INLINE_EXCEPT_MSVC inline
-#else
-#define ALWAYS_INLINE_EXCEPT_MSVC ALWAYS_INLINE
-#endif
-
 /* WTF_EXTERN_C_{BEGIN, END} */
 
 #ifdef __cplusplus

Modified: trunk/Source/WebCore/ChangeLog (230069 => 230070)


--- trunk/Source/WebCore/ChangeLog	2018-03-29 06:49:27 UTC (rev 230069)
+++ trunk/Source/WebCore/ChangeLog	2018-03-29 07:34:58 UTC (rev 230070)
@@ -1,3 +1,18 @@
+2018-03-29  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r230062.
+        https://bugs.webkit.org/show_bug.cgi?id=184128
+
+        Broke mac port. web content process crashes while loading any
+        web page (Requested by rniwa on #webkit).
+
+        Reverted changeset:
+
+        "MSVC __forceinline slows down JSC release build fivefold
+        after r229391"
+        https://bugs.webkit.org/show_bug.cgi?id=184062
+        https://trac.webkit.org/changeset/230062
+
 2018-03-28  Antoine Quint  <grao...@apple.com>
 
         [Web Animations] Implement more CSSPropertyBlendingClient methods

Modified: trunk/Source/WebCore/platform/graphics/FormatConverter.cpp (230069 => 230070)


--- trunk/Source/WebCore/platform/graphics/FormatConverter.cpp	2018-03-29 06:49:27 UTC (rev 230069)
+++ trunk/Source/WebCore/platform/graphics/FormatConverter.cpp	2018-03-29 07:34:58 UTC (rev 230070)
@@ -35,6 +35,13 @@
 #include "GraphicsContext3DNEON.h"
 #endif
 
+// Visual Studio crashes with a C1063 Fatal Error if everything is inlined.
+#if COMPILER(MSVC)
+#define ALWAYS_INLINE_EXCEPT_MSVC
+#else
+#define ALWAYS_INLINE_EXCEPT_MSVC ALWAYS_INLINE
+#endif
+
 namespace WebCore {
 
 
@@ -1198,7 +1205,6 @@
 #undef FORMATCONVERTER_CASE_ALPHAOP
 }
 
-// Visual Studio crashes with a C1063 Fatal Error if everything is inlined.
 template<GraphicsContext3D::DataFormat SrcFormat, GraphicsContext3D::DataFormat DstFormat, GraphicsContext3D::AlphaOp alphaOp>
 ALWAYS_INLINE_EXCEPT_MSVC void FormatConverter::convert()
 {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to