On Tue, 6 Sep 2022 14:01:47 GMT, Kevin Rushforth <k...@openjdk.org> wrote:
>> Hi, >> >> jfx web failed to build when `USE_SYSTEM_MALLOC` is `ON`: >> >> >> jfx/modules/javafx.web/build/linux/Release/WTF/Headers/wtf/Platform.h:58, >> jfx/modules/javafx.web/build/linux/Release/WTF/Headers/wtf/Assertions.h:28, >> jfx/modules/javafx.web/src/main/native/Source/WebCore/platform/java/WebKitLogging.h:31, >> jfx/modules/javafx.web/src/main/native/Source/WebCore/platform/java/WebKitLogging.cpp:28, >> jfx/modules/javafx.web/build/linux/Release/WebCore/DerivedSources/unified-sources/UnifiedSource-3c72abbe-47.cpp:1: >> jfx/modules/javafx.web/build/linux/Release/WTF/Headers/wtf/PlatformUse.h:351:10: >> fatal error: bmalloc/BPlatform.h: No such file or directory >> #include <bmalloc/BPlatform.h> >> ^~~~~~~~~~~~~~~~~~~~~ >> compilation terminated. >> >> >> After commit `6f28d912024495278c4c35ab054bc2aab480b3e4`: >> >> >> diff --git a/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformUse.h >> b/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformUse.h >> index 70c047813f..d30291697a 100644 >> --- a/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformUse.h >> +++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformUse.h >> >> ... >> >> #if PLATFORM(IOS_FAMILY) >> #define USE_SANDBOX_EXTENSIONS_FOR_CACHE_AND_TEMP_DIRECTORY_ACCESS 1 >> #endif >> + >> +#if !defined(USE_LIBPAS_JIT_HEAP) && !USE(SYSTEM_MALLOC) >> +#include <bmalloc/BPlatform.h> >> +#if BENABLE(LIBPAS) >> +#if PLATFORM(MAC) && CPU(ARM64) >> +#define USE_LIBPAS_JIT_HEAP 1 >> +#endif >> +#endif >> +#endif >> + >> >> >> Please review my patch. >> >> Thanks, >> Leslie Zhai > > @jaybhaskar @HimaBinduMeda Can you also review this? Hi @kevinrushforth Thanks for your kind response! > Have you tested this to ensure that there is no change in the default case? I have tested the upstream WebKit for LoongArch64, x86_64 and AArch64 already: https://github.com/WebKit/WebKit/pull/3908 The default case `USE_SYSTEM_MALLOC` is `OFF` x86_64 and AArch64 succesfully include `bmalloc/BPlatform.h` header file. Please point out my fault if I misunderstanding. Thanks, Leslie Zhai ------------- PR: https://git.openjdk.org/jfx/pull/892
