Skip to content

Commit

Permalink
REGRESSION(270651@main): Broke cloop build: LowLevelInterpreter.asm:2…
Browse files Browse the repository at this point in the history
…778 in call to entry: Could not find macro entry (MacroError)

https://bugs.webkit.org/show_bug.cgi?id=265218

Reviewed by Don Olmstead.

WebAssembly no longer requires JIT, but it's still incompatible with
cloop, so let's make sure you cannot build with both enabled and set an
appropriate default value for each architecture.

This is my second attempt to land this change. On the first attempt,
r271252@main, I accidentally changed the default value of
ENABLE_WEBASSEMBLY to "NOT". Let's do better this time.

* Source/cmake/WebKitFeatures.cmake:

Canonical link: https://commits.webkit.org/271347@main
  • Loading branch information
mcatanzaro committed Nov 30, 2023
1 parent 133bcb0 commit e2a9ebe
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion Source/cmake/WebKitFeatures.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ macro(WEBKIT_OPTION_BEGIN)
set(ENABLE_SAMPLING_PROFILER_DEFAULT OFF)
endif ()

if (ENABLE_C_LOOP_DEFAULT)
set(ENABLE_WEBASSEMBLY_DEFAULT OFF)
else ()
set(ENABLE_WEBASSEMBLY_DEFAULT ON)
endif ()

if (DEFINED ClangTidy_EXE OR DEFINED IWYU_EXE)
message(STATUS "Unified builds are disabled when analyzing sources")
set(ENABLE_UNIFIED_BUILDS_DEFAULT OFF)
Expand Down Expand Up @@ -233,7 +239,7 @@ macro(WEBKIT_OPTION_BEGIN)
WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_PRESENTATION_MODE "Toggle Video presentation mode support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN "Toggle video element fullscreen support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY "Toggle WebAssembly support" PRIVATE ${ENABLE_JIT_DEFAULT})
WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY "Toggle WebAssembly support" PRIVATE ${ENABLE_WEBASSEMBLY_DEFAULT})
WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY_BBQJIT "Toggle WebAssembly BBQ JIT support" PRIVATE ${ENABLE_FTL_DEFAULT})
WEBKIT_OPTION_DEFINE(ENABLE_WEBASSEMBLY_OMGJIT "Toggle WebAssembly OMG JIT support" PRIVATE ${ENABLE_FTL_DEFAULT})
WEBKIT_OPTION_DEFINE(ENABLE_WEBDRIVER "Toggle WebDriver service process" PRIVATE OFF)
Expand All @@ -259,6 +265,7 @@ macro(WEBKIT_OPTION_BEGIN)

WEBKIT_OPTION_CONFLICT(ENABLE_JIT ENABLE_C_LOOP)
WEBKIT_OPTION_CONFLICT(ENABLE_SAMPLING_PROFILER ENABLE_C_LOOP)
WEBKIT_OPTION_CONFLICT(ENABLE_WEBASSEMBLY ENABLE_C_LOOP)

WEBKIT_OPTION_DEPEND(ENABLE_ACCESSIBILITY_ISOLATED_TREE ENABLE_ACCESSIBILITY)
WEBKIT_OPTION_DEPEND(ENABLE_WEB_RTC ENABLE_MEDIA_STREAM)
Expand Down

0 comments on commit e2a9ebe

Please sign in to comment.