Merge

Author: pfultz2

.clang-tidy

@@ -50,10 +50,12 @@ Checks: >
         -modernize-type-traits,
         -modernize-use-designated-initializers,
         -modernize-use-nodiscard,
+        -modernize-use-scoped-lock,
         -modernize-use-trailing-return-type,
         -performance-avoid-endl,
         -performance-inefficient-string-concatenation,
         -performance-no-automatic-move,
+        -portability-avoid-pragma-once,
         -portability-simd-intrinsics,
         -portability-std-allocator-const,
         -readability-avoid-nested-conditional-operator,
@@ -68,7 +70,8 @@ Checks: >
         -readability-isolate-declaration,
         -readability-magic-numbers,
         -readability-suspicious-call-argument,
-        -readability-uppercase-literal-suffix
+        -readability-uppercase-literal-suffix,
+        -readability-use-concise-preprocessor-directives
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
 ExcludeHeaderFilterRegex: 'ui_.*.h'
@@ -77,3 +80,5 @@ CheckOptions:
     value:           '1'
   - key:             readability-simplify-boolean-expr.SimplifyDeMorgan
     value:           '0'
+  - key:             modernize-use-trailing-return-type.TransformFunctions
+    value:           false

.github/workflows/CI-mingw.yml

@@ -58,22 +58,19 @@ jobs:
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) cppcheck
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) cppcheck
 
       - name: Build test
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) testrunner
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) testrunner
 
       - name: Run test
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) check
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) check

.github/workflows/CI-unixish-docker.yml

@@ -20,13 +20,11 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04", "ubuntu:24.10"]
+        image: ["ubuntu:24.04"]
         include:
           - build_gui: false
           - image: "ubuntu:24.04"
             build_gui: true
-          - image: "ubuntu:24.10"
-            build_gui: true
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -84,7 +82,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04", "ubuntu:24.10"]
+        image: ["ubuntu:24.04"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -113,12 +111,12 @@ jobs:
       - name: Build cppcheck
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) HAVE_RULES=yes CXXFLAGS="-w"
+          make -j$(nproc) HAVE_RULES=yes CXXOPTS="-w"
 
       - name: Build test
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) testrunner HAVE_RULES=yes CXXFLAGS="-w"
+          make -j$(nproc) testrunner HAVE_RULES=yes CXXOPTS="-w"
 
       - name: Run test
         run: |

.github/workflows/CI-unixish.yml

@@ -151,6 +151,46 @@ jobs:
         run: |
           cmake --build cmake.output --target install
 
+      - name: Run CMake on ubuntu (no CLI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli -G "Unix Makefiles" -DBUILD_CLI=Off
+
+      - name: Run CMake on ubuntu (no CLI / with tests)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          # the test and CLI code are too intertwined so for now we need to reject that
+          if cmake -S . -B cmake.output_nocli_tests -G "Unix Makefiles" -DBUILD_TESTS=On -DBUILD_CLI=Off; then
+            exit 1
+          else
+            exit 0
+          fi
+
+      - name: Run CMake on ubuntu (no CLI / with GUI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli_gui -G "Unix Makefiles" -DBUILD_CLI=Off -DBUILD_GUI=On
+
+      - name: Run CMake on ubuntu (no GUI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
+
+      - name: Run CMake on ubuntu (no GUI / with triage)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          # cannot build triage without GUI
+          if cmake -S . -B cmake.output_nogui_triage -G "Unix Makefiles" -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
+            exit 1
+          else
+            exit 0
+          fi
+
+      - name: Run CMake on ubuntu (no CLI / no GUI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
+
   build_uchar:
 
     strategy:
@@ -179,11 +219,11 @@ jobs:
       - name: Build with Unsigned char
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) CXXFLAGS=-funsigned-char testrunner
+          make -j$(nproc) CXXOPTS=-funsigned-char testrunner
 
       - name: Test with Unsigned char
         run: |
-          ./testrunner TestSymbolDatabase
+          ./testrunner
 
   build_mathlib:
 
@@ -213,11 +253,11 @@ jobs:
       - name: Build with TEST_MATHLIB_VALUE
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) CPPFLAGS=-DTEST_MATHLIB_VALUE all
+          make -j$(nproc) CPPOPTS=-DTEST_MATHLIB_VALUE all
 
       - name: Test with TEST_MATHLIB_VALUE
         run: |
-          make -j$(nproc) CPPFLAGS=-DTEST_MATHLIB_VALUE check
+          make -j$(nproc) CPPOPTS=-DTEST_MATHLIB_VALUE check
 
   check_nonneg:
 
@@ -241,7 +281,7 @@ jobs:
 
       - name: Check syntax with NONNEG
         run: |
-          ls lib/*.cpp | xargs -n 1 -P $(nproc) g++ -fsyntax-only -std=c++0x -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -DNONNEG
+          make check-nonneg
 
   build_cmake_boost:
 
@@ -311,9 +351,11 @@ jobs:
         os: [ubuntu-22.04, macos-13, macos-15]
         include:
           - xdist_n: auto
-          # FIXME: test_color_tty fails with xdist
+          # FIXME: test_color_tty fails with xdist - see #13278
           - os: macos-13
             xdist_n: '1'
+          - os: macos-15
+            xdist_n: '1'
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -569,11 +611,11 @@ jobs:
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           # compile with verification and ast matchers
-          make -j$(nproc) -s CPPFLAGS="-DCHECK_INTERNAL" CXXFLAGS="-g -O2 -w -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
+          make -j$(nproc) -s CXXOPTS="-g -O2 -w" CPPOPTS="-DCHECK_INTERNAL -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
 
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
+          cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
 
       - name: Generate dependencies
         run: |

.github/workflows/asan.yml

@@ -53,7 +53,7 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
+          sudo ./llvm.sh 21
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -74,10 +74,10 @@ jobs:
       # TODO: disable all warnings
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         env:
-          CC: clang-20
-          CXX: clang++-20
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Build cppcheck
         run: |

.github/workflows/clang-tidy.yml

@@ -43,8 +43,8 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
-          sudo apt-get install -y clang-tidy-20
+          sudo ./llvm.sh 21
+          sudo apt-get install -y clang-tidy-21
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -57,14 +57,14 @@ jobs:
 
       - name: Verify clang-tidy configuration
         run: |
-          clang-tidy-20 --verify-config
+          clang-tidy-21 --verify-config
 
       - name: Prepare CMake
         run: |
           cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
         env:
-          CC: clang-20
-          CXX: clang++-20
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Prepare CMake dependencies
         run: |

.github/workflows/coverage.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Compile instrumented
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) all CXXFLAGS="-g -fprofile-arcs -ftest-coverage" HAVE_RULES=yes
+          make -j$(nproc) all CXXOPTS="-g -fprofile-arcs -ftest-coverage" HAVE_RULES=yes
 
       - name: Run instrumented tests
         run: |

.github/workflows/cppcheck-premium.yml

@@ -49,7 +49,7 @@ jobs:
           tar xzvf cppcheckpremium.tar.gz
           mv cppcheckpremium-devdrop-20250713 cppcheckpremium
           # Overwrite cppcheck binary
-          make -j$(nproc) CXXFLAGS=-O2 MATCHCOMPILER=yes
+          make -j$(nproc) CXXOPTS=-O2 MATCHCOMPILER=yes
           cp cppcheck cppcheckpremium/
 
       - name: Generate a license file

.github/workflows/iwyu.yml

@@ -215,13 +215,13 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
-          sudo apt-get install -y clang-tools-20
+          sudo ./llvm.sh 21
+          sudo apt-get install -y clang-tools-21
 
       - name: Install libc++
         if: matrix.stdlib == 'libc++'
         run: |
-          sudo apt-get install -y libc++-20-dev
+          sudo apt-get install -y libc++-21-dev
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -237,8 +237,8 @@ jobs:
           # TODO: why does it build dmake in the next step?
           cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
         env:
-          CC: clang-20
-          CXX: clang++-20
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Prepare CMake dependencies
         run: |
@@ -255,7 +255,7 @@ jobs:
       - name: clang-include-cleaner
         run: |
           # TODO: run multi-threaded
-          find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-20 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
+          find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-21 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
 
       - uses: actions/upload-artifact@v4
         if: success() || failure()

.github/workflows/release-windows.yml

@@ -68,7 +68,7 @@ jobs:
         run: |
           :: TODO: enable rules?
           :: specify Release build so matchcompiler is used
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
           cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
 
       # TODO: package PDBs