Attachment 341802 Details for Bug 185989 – Updated Patch

[patch] Updated Patch

185989-3.patch (text/plain), 5.29 KB, created by Michael Saboff on 2018-06-01 16:35:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Saboff

Created: 2018-06-01 16:35:53 PDT

Size: 5.29 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 232420)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-06-01  Michael Saboff  <msaboff@apple.com>
>+
>+        JavaScriptCore: Disable 32-bit JIT on Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=185989
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsWin.cmake:
>+
> 2018-05-28  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.21.3 release.
>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 232425)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-06-01  Michael Saboff  <msaboff@apple.com>
>+
>+        JavaScriptCore: Disable 32-bit JIT on Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=185989
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Made various minor fixes.
>+
>+        * llint/LLIntData.h:
>+        (JSC::LLInt::getCodePtr): Used a reinterpret_cast since Opcode could be an int.
>+        * llint/LowLevelInterpreter.cpp: Changed the definition of OFFLINE_ASM_GLOBAL_LABEL to not
>+        have a case label these aren't opcodes.
>+        * runtime/Options.cpp: Made assembler related Windows conditional code also conditional
>+        on the JIT being enabled.
>+        (JSC::recomputeDependentOptions):
>+
> 2018-06-01  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Fix the watchOS build after r232385
>Index: Source/JavaScriptCore/llint/LLIntData.h
>===================================================================
>--- Source/JavaScriptCore/llint/LLIntData.h	(revision 232420)
>+++ Source/JavaScriptCore/llint/LLIntData.h	(working copy)
>@@ -83,7 +83,7 @@ inline Opcode getOpcode(OpcodeID id)
> template<PtrTag tag>
> ALWAYS_INLINE MacroAssemblerCodePtr<tag> getCodePtr(OpcodeID opcodeID)
> {
>-    void* address = getOpcode(opcodeID);
>+    void* address = reinterpret_cast<void*>(getOpcode(opcodeID));
>     address = retagCodePtr<BytecodePtrTag, tag>(address);
>     return MacroAssemblerCodePtr<tag>::createFromExecutableAddress(address);
> }
>Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
>===================================================================
>--- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	(revision 232420)
>+++ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	(working copy)
>@@ -106,7 +106,7 @@ using namespace JSC::LLInt;
> 
> #define OFFLINE_ASM_OPCODE_LABEL(opcode) DEFINE_OPCODE(opcode) USE_LABEL(opcode); TRACE_OPCODE(opcode);
> 
>-#define OFFLINE_ASM_GLOBAL_LABEL(label)  OFFLINE_ASM_GLUE_LABEL(label)
>+#define OFFLINE_ASM_GLOBAL_LABEL(label)  label: USE_LABEL(label);
> 
> #if ENABLE(COMPUTED_GOTO_OPCODES)
> #define OFFLINE_ASM_GLUE_LABEL(label)  label: USE_LABEL(label);
>Index: Source/JavaScriptCore/runtime/Options.cpp
>===================================================================
>--- Source/JavaScriptCore/runtime/Options.cpp	(revision 232420)
>+++ Source/JavaScriptCore/runtime/Options.cpp	(working copy)
>@@ -48,7 +48,7 @@
> #include <crt_externs.h>
> #endif
> 
>-#if OS(WINDOWS)
>+#if OS(WINDOWS) && ENABLE(JIT)
> #include "MacroAssembler.h"
> #endif
> 
>@@ -392,7 +392,7 @@ static void recomputeDependentOptions()
>     Options::useConcurrentGC() = false;
> #endif
>     
>-#if OS(WINDOWS) && CPU(X86) 
>+#if OS(WINDOWS) && ENABLE(JIT) && CPU(X86) 
>     // Disable JIT on Windows if SSE2 is not present 
>     if (!MacroAssemblerX86::supportsFloatingPoint())
>         Options::useJIT() = false;
>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 232420)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-06-01  Michael Saboff  <msaboff@apple.com>
>+
>+        JavaScriptCore: Disable 32-bit JIT on Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=185989
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+
> 2018-05-31  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r232212.
>Index: Source/WTF/wtf/Platform.h
>===================================================================
>--- Source/WTF/wtf/Platform.h	(revision 232420)
>+++ Source/WTF/wtf/Platform.h	(working copy)
>@@ -732,6 +732,12 @@
> #define ENABLE_JIT 0
> #endif
> 
>+/* Disable the JIT for 32-bit Windows builds. */
>+#if USE(JSVALUE32_64) && OS(WINDOWS)
>+#undef ENABLE_JIT
>+#define ENABLE_JIT 0
>+#endif
>+
> /* The FTL *does not* work on 32-bit platforms. Disable it even if someone asked us to enable it. */
> #if USE(JSVALUE32_64)
> #undef ENABLE_FTL_JIT
>Index: Source/cmake/OptionsWin.cmake
>===================================================================
>--- Source/cmake/OptionsWin.cmake	(revision 232420)
>+++ Source/cmake/OptionsWin.cmake	(working copy)
>@@ -45,6 +45,9 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PUBLIC OFF)
>+if (${WTF_CPU_X86})
>+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC OFF)
>+endif ()
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PUBLIC ON)

Flags:

mark.lam: review+
msaboff: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185989: 341312 | 341801 | 341802 | 341822