5 Commits
Author SHA1 Message Date
weaselbot becbbcbc28 Fix release and coverage CI failures
CI / pre-commit (pull_request) Failing after 1m53s
CI / release (arm64, ubuntu-latest-arm64) (pull_request) Failing after 3m14s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m44s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m37s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m38s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m37s
CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 5m5s
CI / coverage (pull_request) Successful in 3m45s
* 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 02:33:31 -04:00
weaselbot f22e5bed92 Make ConflictSet non-copyable in C++98/C++03
`ConflictSet(const ConflictSet&)` and `operator=(const ConflictSet&)` were
only deleted for C++11 and later. In C++98/C++03 the compiler implicitly
generated public copy operations, so copying a ConflictSet shared the opaque
`Impl*` and caused a double-free on destruction.

Declare both operations private and leave them undefined when
`__cplusplus <= 199711L`, matching the standard pre-C++11 idiom for
move-only types. Guard the declarations with `defined(__cplusplus)` so
they are not exposed to C90 compilation units.

Closes #48
2026-06-22 02:32:18 -04:00
andrew d70e6a2455 Merge pull request 'Set restype=None for void-returning C functions' (#53) from weaselbot/conflict-set:weaselbot/issue-46 into main
CI / release (arm64, ubuntu-latest-arm64) (push) Failing after 11m28s
CI / pre-commit (push) Successful in 2m5s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (push) Successful in 3m37s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (push) Successful in 3m29s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (push) Successful in 3m38s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (push) Successful in 3m28s
CI / release (amd64, ubuntu-latest-amd64) (push) Successful in 5m3s
CI / coverage (push) Failing after 3m31s
Reviewed-on: #53
2026-06-22 01:12:47 +00:00
andrew 8a5168f232 CMakeLists: only pass hardening-check arch flags the tool supports
CI / release (arm64, ubuntu-latest-arm64) (push) Failing after 11m36s
CI / pre-commit (push) Successful in 2m14s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (push) Successful in 3m44s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (push) Successful in 3m41s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (push) Successful in 3m45s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (push) Successful in 3m29s
CI / release (amd64, ubuntu-latest-amd64) (push) Successful in 4m59s
CI / coverage (push) Failing after 3m21s
The amd64 CI runner's hardening-check does not recognize
--nobranchprotection, causing the hardening_check test to fail at
configure time. Query the tool's help output and only include the
architecture-specific skip flags when they are advertised.
2026-06-21 21:07:26 -04:00
weaselbotandandrew 742d920aa1 Set restype=None for void-returning C functions in conflict_set.py
CI / release (arm64, ubuntu-latest-arm64) (pull_request) Successful in 3m28s
CI / pre-commit (pull_request) Successful in 2m14s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m39s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m33s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m44s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m32s
CI / release (amd64, ubuntu-latest-amd64) (pull_request) Failing after 4m25s
CI / coverage (pull_request) Failing after 3m20s
ConflictSet_check, ConflictSet_addWrites, ConflictSet_setOldestVersion,
and ConflictSet_destroy return void in C, but the Python wrapper left
their ctypes restype at the default c_int. Set restype = None for each
to match the C API contract and avoid undefined behavior from reading
the return register of void functions.
2026-06-21 19:25:27 -04:00
2 changed files with 27 additions and 16 deletions
+23 -16
View File
@@ -383,26 +383,33 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING)
find_program(HARDENING_CHECK hardening-check) find_program(HARDENING_CHECK hardening-check)
if(HARDENING_CHECK) if(HARDENING_CHECK)
# Control flow integrity (CET) is x86-only and branch protection (PAC/BTI) # Not all versions of hardening-check support the same options, so query
# is arm64-only, so ignore whichever doesn't apply. Newer hardening-check # the help output before using architecture-specific skips. Newer
# versions spell some of these flags with hyphens, so pick a supported # versions spell some of these flags with hyphens, so pick a supported
# form at configure time. # form at configure time.
execute_process( execute_process(
COMMAND ${HARDENING_CHECK} --help COMMAND ${HARDENING_CHECK} --help
OUTPUT_VARIABLE _hardening_help OUTPUT_VARIABLE hardening_check_help
ERROR_QUIET) ERROR_VARIABLE hardening_check_help
if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE
STREQUAL arm64) RESULT_VARIABLE hardening_check_help_result)
if(_hardening_help MATCHES "--nocfprotection") set(hardening_check_arch_flags "")
set(hardening_check_arch_flags --nocfprotection) if(hardening_check_help_result EQUAL 0)
elseif(_hardening_help MATCHES "--no-cf-protection") # Control flow integrity (CET) is x86-only and branch protection
set(hardening_check_arch_flags --no-cf-protection) # (PAC/BTI) is arm64-only, so ignore whichever doesn't apply.
endif() if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR
else() STREQUAL arm64)
if(_hardening_help MATCHES "--nobranchprotection") if(hardening_check_help MATCHES "nocfprotection")
set(hardening_check_arch_flags --nobranchprotection) list(APPEND hardening_check_arch_flags --nocfprotection)
elseif(_hardening_help MATCHES "--no-branch-protection") elseif(hardening_check_help MATCHES "no-cf-protection")
set(hardening_check_arch_flags --no-branch-protection) list(APPEND hardening_check_arch_flags --no-cf-protection)
endif()
else()
if(hardening_check_help MATCHES "nobranchprotection")
list(APPEND hardening_check_arch_flags --nobranchprotection)
elseif(hardening_check_help MATCHES "no-branch-protection")
list(APPEND hardening_check_arch_flags --no-branch-protection)
endif()
endif() endif()
endif() endif()
add_test( add_test(
+4
View File
@@ -88,6 +88,7 @@ class ConflictSet:
ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_int),
ctypes.c_int, ctypes.c_int,
) )
self._lib.ConflictSet_check.restype = None
self._lib.ConflictSet_addWrites.argtypes = ( self._lib.ConflictSet_addWrites.argtypes = (
ctypes.c_void_p, ctypes.c_void_p,
@@ -95,13 +96,16 @@ class ConflictSet:
ctypes.c_int, ctypes.c_int,
ctypes.c_int64, ctypes.c_int64,
) )
self._lib.ConflictSet_addWrites.restype = None
self._lib.ConflictSet_setOldestVersion.argtypes = ( self._lib.ConflictSet_setOldestVersion.argtypes = (
ctypes.c_void_p, ctypes.c_void_p,
ctypes.c_int64, ctypes.c_int64,
) )
self._lib.ConflictSet_setOldestVersion.restype = None
self._lib.ConflictSet_destroy.argtypes = (ctypes.c_void_p,) self._lib.ConflictSet_destroy.argtypes = (ctypes.c_void_p,)
self._lib.ConflictSet_destroy.restype = None
self._lib.ConflictSet_getBytes.argtypes = (ctypes.c_void_p,) self._lib.ConflictSet_getBytes.argtypes = (ctypes.c_void_p,)
self._lib.ConflictSet_getBytes.restype = ctypes.c_int64 self._lib.ConflictSet_getBytes.restype = ctypes.c_int64