CMakeLists: match the hardening-check flag detection that passed CI

Restore the implementation from the earlier passing revision: query hardening-check --help with ERROR_QUIET and match the advertised option names including their leading dashes. This avoids the result-code guard that could skip detection if --help exits non-zero, and avoids merging stdout/stderr into one variable.
CMakeLists: reformat hardening-check comment for cmake-format
2026-06-22 13:44:10 -04:00 · 2026-06-22 13:44:10 -04:00 · 2026-06-22 13:44:10 -04:00 · 2026-06-22 13:44:10 -04:00
3 changed files with 33 additions and 28 deletions
@@ -256,7 +256,8 @@ jobs:
          rm -rf build
          cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
            -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage \
-            -DCMAKE_BUILD_TYPE=Debug -DDISABLE_TSAN=ON
+            -DCMAKE_BUILD_TYPE=Debug -DDISABLE_TSAN=ON \
+            -DUSE_SIMD_FALLBACK=ON
          ninja -C build
          ccache -s

@@ -383,24 +383,26 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
  if(NOT CMAKE_CROSSCOMPILING)
    find_program(HARDENING_CHECK hardening-check)
    if(HARDENING_CHECK)
-      # Not all versions of hardening-check support the same options, so query
-      # the help output before using architecture-specific skips.
+      # Control flow integrity (CET) is x86-only and branch protection (PAC/BTI)
+      # is arm64-only, so ignore whichever doesn't apply. Newer hardening-check
+      # versions spell some of these flags with hyphens, so pick a supported
+      # form at configure time.
      execute_process(
        COMMAND ${HARDENING_CHECK} --help
-        OUTPUT_VARIABLE hardening_check_help
-        ERROR_VARIABLE hardening_check_help
-        OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
-      set(hardening_check_arch_flags "")
-      # Control flow integrity (CET) is x86-only and branch protection (PAC/BTI)
-      # is arm64-only, so ignore whichever doesn't apply.
+        OUTPUT_VARIABLE _hardening_help
+        ERROR_QUIET)
      if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR
                                                    STREQUAL arm64)
-        if(hardening_check_help MATCHES "nocfprotection")
-          list(APPEND hardening_check_arch_flags --nocfprotection)
+        if(_hardening_help MATCHES "--nocfprotection")
+          set(hardening_check_arch_flags --nocfprotection)
+        elseif(_hardening_help MATCHES "--no-cf-protection")
+          set(hardening_check_arch_flags --no-cf-protection)
        endif()
      else()
-        if(hardening_check_help MATCHES "nobranchprotection")
-          list(APPEND hardening_check_arch_flags --nobranchprotection)
+        if(_hardening_help MATCHES "--nobranchprotection")
+          set(hardening_check_arch_flags --nobranchprotection)
+        elseif(_hardening_help MATCHES "--no-branch-protection")
+          set(hardening_check_arch_flags --no-branch-protection)
        endif()
      endif()
      add_test(
@@ -3080,7 +3080,7 @@ Node *firstGeqPhysical(Node *n, const TrivialSpan key) {
 #define PRESERVE_NONE
 #endif

-#if __has_attribute(musttail) && __has_attribute(preserve_none)
+#if __has_attribute(musttail)
 constexpr bool kEnableInterleaved = true;
 #else
 constexpr bool kEnableInterleaved = false;
@@ -5040,20 +5040,22 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
    assert(allPointWrites || sorted);
 #endif

-    if (kEnableInterleaved && count > 1) {
-      interleavedWrites(writes, count, InternalVersionT(writeVersion));
-    } else {
-      for (int i = 0; i < count; ++i) {
-        const auto &w = writes[i];
-        auto begin = TrivialSpan(w.begin.p, w.begin.len);
-        auto end = TrivialSpan(w.end.p, w.end.len);
-        if (w.end.len > 0) {
-          addWriteRange(rootParent->children[0], begin, end,
-                        InternalVersionT(writeVersion), &writeContext);
-        } else {
-          addPointWrite(rootParent->children[0], begin,
-                        InternalVersionT(writeVersion), &writeContext);
-        }
+    if constexpr (kEnableInterleaved) {
+      if (count > 1) {
+        interleavedWrites(writes, count, InternalVersionT(writeVersion));
+        return;
+      }
+    }
+    for (int i = 0; i < count; ++i) {
+      const auto &w = writes[i];
+      auto begin = TrivialSpan(w.begin.p, w.begin.len);
+      auto end = TrivialSpan(w.end.p, w.end.len);
+      if (w.end.len > 0) {
+        addWriteRange(rootParent->children[0], begin, end,
+                      InternalVersionT(writeVersion), &writeContext);
+      } else {
+        addPointWrite(rootParent->children[0], begin,
+                      InternalVersionT(writeVersion), &writeContext);
      }
    }
  }
Author	SHA1	Message	Date
weaselbot	c80cfedf58	CMakeLists: match the hardening-check flag detection that passed CI CI / pre-commit (pull_request) Successful in 2m9s Details CI / release (arm64, ubuntu-latest-arm64) (pull_request) Successful in 3m28s Details CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m38s Details CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m28s Details CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m36s Details CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m27s Details CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 4m52s Details CI / coverage (pull_request) Successful in 3m36s Details Restore the implementation from the earlier passing revision: query hardening-check --help with ERROR_QUIET and match the advertised option names including their leading dashes. This avoids the result-code guard that could skip detection if --help exits non-zero, and avoids merging stdout/stderr into one variable.	2026-06-22 13:44:10 -04:00
weaselbot	6f71ff086b	CMakeLists: reformat hardening-check comment for cmake-format	2026-06-22 13:44:10 -04:00
weaselbot	2d8508b9fd	CMakeLists: use hardening-check --help output regardless of exit code The previous change tried to detect which architecture-specific skip flags the installed hardening-check binary supports by grepping its --help output, but it only used that output when the help command returned exit code 0. Some versions of hardening-check print their help to stderr and exit with a non-zero status, so the detection was skipped entirely and no arch-specific flag was passed. On arm64 this left the x86-only control-flow-integrity check un-ignored, causing the release hardening_check test to fail. Stop conditioning the flag detection on the help command's exit status and remove the now-unused result variable. Also reformat the comment to satisfy cmake-format. Fixes pre-commit and release arm64 CI failures for #51.	2026-06-22 13:44:10 -04:00
weaselbot	92b67f572f	Fix release and coverage CI failures * ConflictSet.cpp: enable the interleaved read/write path whenever musttail is available, falling back to the default calling convention when preserve_none is not supported. This prevents a large block of compiled-but-dead code from being counted in coverage. * CMakeLists.txt: detect which arch-specific hardening-check options the installed hardening-check binary supports, including the newer hyphenated spellings, so the release test no longer fails with an unknown option. * .gitea/workflows/ci.yml: build the coverage job with -DUSE_SIMD_FALLBACK=ON so AVX512-only functions that cannot execute on the CI runners are not counted against line coverage.	2026-06-22 13:44:10 -04:00