Skip to content

Commit da80566

Browse files
committed
[JSC] Disable JIT for Windows
https://bugs.webkit.org/show_bug.cgi?id=254478 Reviewed by Carlos Alberto Lopez Perez. Windows JSC JIT is crashing now. <https://webkit.org/b/273854> Disabled JIT for Windows temporarily. * LayoutTests/platform/wincairo/TestExpectations: * Source/cmake/OptionsWin.cmake: * Source/cmake/WebKitFeatures.cmake: Canonical link: https://commits.webkit.org/278545@main
1 parent 5ab3ad6 commit da80566

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

LayoutTests/platform/wincairo/TestExpectations

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,9 +3192,19 @@ webkit.org/b/263926 fast/animation/request-animation-frame-throttling-detached-i
31923192

31933193
webkit.org/b/261308 imported/w3c/web-platform-tests/cookies/path/default.html [ Pass Failure ]
31943194

3195-
imported/w3c/web-platform-tests/wasm/serialization/module/nested-worker-success.any.worker.html [ Skip ] # Failure
3196-
imported/w3c/web-platform-tests/wasm/serialization/module/serialization-via-notifications-api.any.html [ Skip ] # Failure
3197-
imported/w3c/web-platform-tests/wasm/serialization/module/serialization-via-notifications-api.any.worker.html [ Skip ] # Failure
3195+
# Needs JIT
3196+
js/slow-stress [ Skip ]
3197+
3198+
# Web Assembly is't supported yet
3199+
imported/w3c/web-platform-tests/wasm [ Skip ]
3200+
js/dom/webassembly-memory-normal-fail.html [ Skip ]
3201+
js/dom/webassembly-memory-shared-basic.html [ Skip ]
3202+
js/dom/webassembly-memory-shared-fail.html [ Skip ]
3203+
storage/indexeddb/wasm-exceptions.html [ Skip ]
3204+
wasm [ Skip ]
3205+
webgl/2.0.y/conformance2/wasm [ Skip ]
3206+
workers/wasm-long-compile.html [ Skip ]
3207+
workers/wasm-mem-post-message.html [ Skip ]
31983208

31993209
workers/wasm-hashset-many-2.html [ Skip ] # Timeout
32003210
workers/wasm-hashset-many.html [ Skip ] # Timeout

Source/cmake/OptionsWin.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PUBLIC OFF)
107107
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PUBLIC OFF)
108108
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PUBLIC OFF)
109109
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PUBLIC OFF)
110-
if (${WTF_CPU_X86})
111-
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC OFF)
112-
endif ()
113110
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_TESTS PUBLIC ON)
114111
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PUBLIC ON)
115112
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PUBLIC OFF)

Source/cmake/WebKitFeatures.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,13 @@ option(USE_64KB_PAGE_BLOCK "Support 64 KB userspace page size (reduces security
7676
macro(WEBKIT_OPTION_BEGIN)
7777
set(_SETTING_WEBKIT_OPTIONS TRUE)
7878

79-
if (USE_64KB_PAGE_BLOCK)
79+
if (WTF_OS_WINDOWS)
80+
set(ENABLE_JIT_DEFAULT OFF)
81+
set(ENABLE_FTL_DEFAULT OFF)
82+
set(USE_SYSTEM_MALLOC_DEFAULT ON)
83+
set(ENABLE_C_LOOP_DEFAULT OFF)
84+
set(ENABLE_SAMPLING_PROFILER_DEFAULT OFF)
85+
elseif (USE_64KB_PAGE_BLOCK)
8086
set(ENABLE_JIT_DEFAULT OFF)
8187
set(ENABLE_FTL_DEFAULT OFF)
8288
set(USE_SYSTEM_MALLOC_DEFAULT ON)

0 commit comments

Comments
 (0)