From 5a15d2cd4d46031fe713623b6f11e0142a73354b Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Fri, 21 Jan 2022 00:46:34 +0800 Subject: [PATCH] browser(webkit): Fix WebKit compilation on Ubuntu 18.04 (#11514) --- browser_patches/webkit/BUILD_NUMBER | 4 +-- browser_patches/webkit/patches/bootstrap.diff | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 113327bc4c..38e97e8c09 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1598 -Changed: dpino@igalia.com Thu 20 Jan 2022 03:29:49 AM UTC +1599 +Changed: dpino@igalia.com Thu Jan 20 22:58:31 HKT 2022 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 77938fdf32..6c00970c65 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1818,6 +1818,34 @@ index 5219f8f7242b86f940e82823584e61fe2ba49e61..51bd401528326fc8fea07ed052d0f561 // Do not use icu::TimeZone::createDefault. ICU internally has a cache for timezone and createDefault returns this cached value. m_timeZoneCache = std::unique_ptr(bitwise_cast(icu::TimeZone::detectHostTimeZone())); #endif +diff --git a/Source/JavaScriptCore/wasm/WasmCompilationMode.h b/Source/JavaScriptCore/wasm/WasmCompilationMode.h +index 6f134e33eb8ebdd3888fdb068df7bfcd0c4225fd..1e3f2f08ee3bcb1d4a52009907a2dd9e622c4c67 100644 +--- a/Source/JavaScriptCore/wasm/WasmCompilationMode.h ++++ b/Source/JavaScriptCore/wasm/WasmCompilationMode.h +@@ -50,7 +50,6 @@ constexpr inline bool isOSREntry(CompilationMode compilationMode) + case CompilationMode::OMGForOSREntryMode: + return true; + } +- RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(false); + } + + constexpr inline bool isAnyBBQ(CompilationMode compilationMode) +@@ -65,7 +64,6 @@ constexpr inline bool isAnyBBQ(CompilationMode compilationMode) + case CompilationMode::EmbedderEntrypointMode: + return false; + } +- RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(false); + } + + constexpr inline bool isAnyOMG(CompilationMode compilationMode) +@@ -80,7 +78,6 @@ constexpr inline bool isAnyOMG(CompilationMode compilationMode) + case CompilationMode::EmbedderEntrypointMode: + return false; + } +- RELEASE_ASSERT_UNDER_CONSTEXPR_CONTEXT(false); + } + + } } // namespace JSC::Wasm diff --git a/Source/PlatformWPE.cmake b/Source/PlatformWPE.cmake index fabd776e617d07a6c30b9f2df30f884491259359..d9c39df7db565545108c765407ce1cda544856f7 100644 --- a/Source/PlatformWPE.cmake