RFR: 8293375: add_definitions USE_SYSTEM_MALLOC when USE_SYSTEM_MALLOC is ON

Leslie Zhai lzhai at openjdk.org
Tue Sep 6 01:25:25 UTC 2022


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

-------------

Commit messages:
 - 8293375: add_definitions USE_SYSTEM_MALLOC when USE_SYSTEM_MALLOC is ON

Changes: https://git.openjdk.org/jfx/pull/892/files
 Webrev: https://webrevs.openjdk.org/?repo=jfx&pr=892&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8293375
  Stats: 4 lines in 1 file changed: 4 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/jfx/pull/892.diff
  Fetch: git fetch https://git.openjdk.org/jfx pull/892/head:pull/892

PR: https://git.openjdk.org/jfx/pull/892


More information about the openjfx-dev mailing list