CVS commit: pkgsrc/www/firefox

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 20 09:31:25 UTC 2023

Modified Files:
        pkgsrc/www/firefox: distinfo
        pkgsrc/www/firefox/patches: patch-js_src_jit_FlushICache.cpp

Log Message:
firefox: fix incomplete aarch64 patch

Linux membarrier(2) is used by Firefox on ARM to trigger an IPI-induced
ICache flush from the WASM compiler thread during tiered compilation.

When the syscall is not available, it is unsafe to do tiered compilation
and it must be disabled, but this check didn't work properly.

Unfortunately there are still frequent tab crashes on aarch64, but likely
the cause is elsewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.504 -r1.505 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-js_src_jit_FlushICache.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.504 pkgsrc/www/firefox/distinfo:1.505
--- pkgsrc/www/firefox/distinfo:1.504   Thu Aug 17 20:43:43 2023
+++ pkgsrc/www/firefox/distinfo Sun Aug 20 09:31:25 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.504 2023/08/17 20:43:43 ryoon Exp $
+$NetBSD: distinfo,v 1.505 2023/08/20 09:31:25 tnn Exp $
 
 BLAKE2s (firefox-116.0.3.source.tar.xz) = 22e0a147eaeab2c65516f3bd7277ba7ff45e232d7f2ba56179f6f5a6c88bd6c0
 SHA512 (firefox-116.0.3.source.tar.xz) = 194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9
@@ -19,7 +19,7 @@ SHA1 (patch-gfx_wr_swgl_build.rs) = df6e
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 753bb4e90758f5b42a51bbc073b328de673988cf
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 6cdd0fe60455eab8f9846257c2bfea207f19478b
-SHA1 (patch-js_src_jit_FlushICache.cpp) = b7536050d06e87612fbedc7ce269b5f120eb0ce9
+SHA1 (patch-js_src_jit_FlushICache.cpp) = d1e611eaf7d7be22abfac6b39fbcd99df3570e47
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc

Index: pkgsrc/www/firefox/patches/patch-js_src_jit_FlushICache.cpp
diff -u pkgsrc/www/firefox/patches/patch-js_src_jit_FlushICache.cpp:1.1 pkgsrc/www/firefox/patches/patch-js_src_jit_FlushICache.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-js_src_jit_FlushICache.cpp:1.1     Sat Oct  8 21:18:55 2022
+++ pkgsrc/www/firefox/patches/patch-js_src_jit_FlushICache.cpp Sun Aug 20 09:31:24 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_jit_FlushICache.cpp,v 1.1 2022/10/08 21:18:55 ryoon Exp $
+$NetBSD: patch-js_src_jit_FlushICache.cpp,v 1.2 2023/08/20 09:31:24 tnn Exp $
 
 NetBSD does not have the Linux-specific membarrier(2) syscall.
 
---- js/src/jit/FlushICache.cpp.orig    2022-09-08 19:35:33.000000000 +0000
+--- js/src/jit/FlushICache.cpp.orig    2023-08-15 20:31:19.000000000 +0000
 +++ js/src/jit/FlushICache.cpp
 @@ -31,12 +31,18 @@
  #    elif defined(__android__)
@@ -23,3 +23,12 @@ NetBSD does not have the Linux-specific 
  }
  
  // These definitions come from the Linux kernel source, for kernels before 4.16
+@@ -92,6 +98,8 @@ bool CanFlushExecutionContextForAllThrea
+ 
+   computed = true;
+   return kernelHasMembarrier;
++#  elif defined(__NetBSD__)
++  return false;
+ #  else
+   // On other platforms, we assume that the syscall for flushing the icache
+   // will flush the execution context for other cores.