phprus
diff --git a/‎scripts/build.py‎
Lines changed: 18 additions & 18 deletions b/‎scripts/build.py‎
Lines changed: 18 additions & 18 deletions
diff --git a/‎test/bench/game_of_life.cpp‎
Lines changed: 7 additions & 3 deletions b/‎test/bench/game_of_life.cpp‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎test/bench/show_allocations.cpp‎
Lines changed: 4 additions & 2 deletions b/‎test/bench/show_allocations.cpp‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎test/meson.build‎
Lines changed: 2 additions & 0 deletions b/‎test/meson.build‎
Lines changed: 2 additions & 0 deletions
@@ -7,39 +7,39 @@
 
 cmd_and_dir = [
     # needs honggfuzz installed
-    ['env', 'CXX=ccache hfuzz-clang++ -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION', 'meson', 'setup', '--buildtype', 'release', '-Dcpp_std=c++17', 'builddir/hfuzz-clang_cpp17_release'],
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'release', '-Dcpp_std=c++17', 'builddir/clang_cpp17_release'],
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'debug',   '-Dcpp_std=c++17', 'builddir/clang_cpp17_debug'],
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'release', '-Dcpp_std=c++17', 'builddir/gcc_cpp17_release'],
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'debug',   '-Dcpp_std=c++17', 'builddir/gcc_cpp17_debug'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'release', '-Dcpp_std=c++17', 'builddir/gcc_cpp17_release'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'release', '-Dcpp_std=c++17', 'builddir/clang_cpp17_release'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache hfuzz-clang++ -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION', 'meson', 'setup', '--buildtype', 'release', '-Dcpp_std=c++17', 'builddir/hfuzz-clang_cpp17_release'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'debug',   '-Dcpp_std=c++17', 'builddir/clang_cpp17_debug'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'debug',   '-Dcpp_std=c++17', 'builddir/gcc_cpp17_debug'],
 
     # 32bit. Install lib32-clang
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++17', '-Dcpp_args=-m32', '-Dcpp_link_args=-m32', '-Dc_args=-m32', '-Dc_link_args=-m32', 'builddir/gcc_cpp17_debug_32'],
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++17', '-Dcpp_args=-m32', '-Dcpp_link_args=-m32', '-Dc_args=-m32', '-Dc_link_args=-m32', 'builddir/clang_cpp17_debug_32'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++17', '-Dcpp_args=-m32', '-Dcpp_link_args=-m32', '-Dc_args=-m32', '-Dc_link_args=-m32', 'builddir/gcc_cpp17_debug_32'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++17', '-Dcpp_args=-m32', '-Dcpp_link_args=-m32', '-Dc_args=-m32', '-Dc_link_args=-m32', 'builddir/clang_cpp17_debug_32'],
 
     # c++20
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++20', 'builddir/clang_cpp20_debug'],
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++20', 'builddir/gcc_cpp20_debug'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++20', 'builddir/clang_cpp20_debug'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '--buildtype', 'debug', '-Dcpp_std=c++20', 'builddir/gcc_cpp20_debug'],
 
     # coverage; use "ninja clean && ninja test && ninja coverage"
-    #['env', 'CXX=ccache clang++', 'meson', 'setup', '-Db_coverage=true', 'builddir/coverage'],
+    #['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '-Db_coverage=true', 'builddir/coverage'],
 
     # sanitizers
     # It is not possible to combine more than one of the -fsanitize=address, -fsanitize=thread, and -fsanitize=memory checkers in the same program.
     # see https://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
     #
     # can't use ccache, it doesn't work with the ignorelist.txt
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=address',   'builddir/gcc_sanitize_address'],
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=address',   'builddir/clang_sanitize_address'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=address',   'builddir/gcc_sanitize_address'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=address',   'builddir/clang_sanitize_address'],
 
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=thread',    'builddir/gcc_sanitize_thread'],
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=thread',    'builddir/clang_sanitize_thread'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=thread',    'builddir/gcc_sanitize_thread'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=thread',    'builddir/clang_sanitize_thread'],
 
-    # ['env', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=memory',    'builddir/gcc_sanitize_memory'], # doesn't work due to STL, and ignore doesn't work either :-(
-    # ['env', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=memory',    'builddir/clang_sanitize_memory'], # doesn't work due to STL, and ignore doesn't work either :-(
+    # ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=memory',    'builddir/gcc_sanitize_memory'], # doesn't work due to STL, and ignore doesn't work either :-(
+    # ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=memory',    'builddir/clang_sanitize_memory'], # doesn't work due to STL, and ignore doesn't work either :-(
 
-    ['env', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=undefined', 'builddir/gcc_sanitize_undefined'],
-    ['env', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=undefined', 'builddir/clang_sanitize_undefined'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache g++',     'meson', 'setup', '-Db_sanitize=undefined', 'builddir/gcc_sanitize_undefined'],
+    ['env', 'CXX_LD=mold', 'CXX=ccache clang++', 'meson', 'setup', '-Db_sanitize=undefined', 'builddir/clang_sanitize_undefined'],
 ]
 
 root_path = Path(__file__).parent.parent
 
@@ -9,16 +9,20 @@
 #include <vector>
 
 #if __has_include("boost/unordered/unordered_flat_map.hpp")
-#    pragma clang diagnostic ignored "-Wold-style-cast"
+#    if defined(__clang__)
+#        pragma clang diagnostic ignored "-Wold-style-cast"
+#    endif
 #    include "boost/unordered/unordered_flat_map.hpp"
 #    define HAS_BOOST_UNORDERED_FLAT_MAP() 1 // NOLINT(cppcoreguidelines-macro-usage)
 #else
 #    define HAS_BOOST_UNORDERED_FLAT_MAP() 0 // NOLINT(cppcoreguidelines-macro-usage)
 #endif
 
 #if 0 && __has_include("absl/container/flat_hash_map.h")
-#    pragma clang diagnostic ignored "-Wdeprecated-builtins"
-#    pragma clang diagnostic ignored "-Wsign-conversion"
+#    if defined(__clang__)
+#        pragma clang diagnostic ignored "-Wdeprecated-builtins"
+#        pragma clang diagnostic ignored "-Wsign-conversion"
+#    endif
 #    include <absl/container/flat_hash_map.h>
 #    define HAS_ABSL() 1 // NOLINT(cppcoreguidelines-macro-usage)
 #else
 
@@ -6,8 +6,10 @@
 #include <third-party/nanobench.h>
 
 #if __has_include("boost/unordered/unordered_flat_map.hpp")
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wold-style-cast"
+#    if defined(__clang__)
+#        pragma clang diagnostic push
+#        pragma clang diagnostic ignored "-Wold-style-cast"
+#    endif
 #    include "boost/unordered/unordered_flat_map.hpp"
 #    define HAS_BOOST_UNORDERED_FLAT_MAP() 1 // NOLINT(cppcoreguidelines-macro-usage)
 #else
 
@@ -88,6 +88,7 @@ foreach arg : [
             '-Wno-stringop-overflow', # g++ error in fmtlib
             '-Warith-conversion',
             '-Wshadow=global',
+            '-Wno-array-bounds', # gcc 13 gives incorrect warning
 
             # gcc / clang
             '-Wconversion',
@@ -154,6 +155,7 @@ cpp_args += [
 link_args += [
     #'-fsanitize=undefined,address',
     #'-fno-sanitize=thread'
+    #'-Wl,-shuffle-sections' # for benchmarking with mold linker
 ]
 
 test_exe = executable(