On Wed, 16 Mar 2022 07:54:57 GMT, Peter Zhelezniakov <pet...@openjdk.org> wrote:
> The file `wtf/linux/MemoryPressureLinux.cpp` was renamed > `wtf/unix/MemoryPressureUnix.cpp` in https://trac.webkit.org/changeset/261428 > . In the openjfx workspace, both files are present. I'm removing the old file. There are two issues (which suggests that I should have filed a new bug when we updated to WebKit 613.1). The new one that this PR fixes, and the one we originally ran into in WebKit 612.1, possibly relating to the version of Ruby. I can confirm that this PR by Peter solves the problem caused by the leftover `MemoryPressureHandlerLinux`. On our CI build system I still see the problem we initially ran into back in 612.1 in `resolve-asm-file-conflicts.rb`: Scanning dependencies of target LowLevelInterpreterLib [ 26%] Building CXX object Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:99:in `parse': undefined method `/' for #<Pathname:working_directory> (NoMethodError) from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:149:in `test' from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:237:in `block in selftest' from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:236:in `each' from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:236:in `selftest' from modules/javafx.web/build/linux/Debug/JavaScriptCore/Scripts/resolve-asm-file-conflicts.rb:430:in `<main>' Error running cmd: pid 12750 exit 1 gmake[2]: *** [Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/llint/LowLevelInterpreter.cpp.o] Error 1 gmake[1]: *** [Source/JavaScriptCore/CMakeFiles/LowLevelInterpreterLib.dir/all] Error 2 gmake: *** [all] Error 2 We might want to take this fix to remove the leftover file, and then file a new one for the original problem, since that one hits older systems with older version of Ruby. @jaybhaskar what do you think? ------------- PR: https://git.openjdk.java.net/jfx/pull/756
