Merge branch 'master' into variadic-call

Author: lucic71

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
 
     - name: Setup LLVM
       if: matrix.language == 'cpp'

.github/workflows/format.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup LLVM
         uses: ZhongRuoyu/setup-llvm@v0

.github/workflows/run-tests.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup LLVM
         uses: ZhongRuoyu/setup-llvm@v0
@@ -47,9 +47,3 @@ jobs:
       - name: Run unit tests
         run: ninja check
         working-directory: build
-
-      - name: Check benchmarks (don't run)
-        run: ninja check-benchmarks
-        working-directory: build
-        env:
-          SKIP_RUN: 1

.gitignore

@@ -1,9 +1,11 @@
 # CMake
 build/
+_buildconfig.py
 
 # Cargo
 target/
 Cargo.lock
+rules/rustls/rustls.h
 
 # Python
 *.pyc

CMakeLists.txt

@@ -50,6 +50,9 @@ execute_process(
 )
 message(STATUS ${CLANG_OUTPUT})
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/generate-buildconfig-py.cmake)
+generate_buildconfig_py("${CMAKE_CURRENT_SOURCE_DIR}/tests/lit/lit")
+
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/rust-toolchain.cmake)
 set(RUST_STAMP_FILE "${CMAKE_BINARY_DIR}/.rust-toolchain.stamp")
 
@@ -129,28 +132,14 @@ add_custom_target("check-unit"
                   USES_TERMINAL
                  )
 
-add_custom_target("check-benchmarks"
-                  COMMAND ${CMAKE_COMMAND} -E env
-                          "CC=${CMAKE_C_COMPILER}"
-                          "CXX=${CMAKE_CXX_COMPILER}"
-                          "python3"
-                          "${PROJECT_SOURCE_DIR}/tests/lit/lit.py"
-                          ${LIT_FLAGS}
-                          "${PROJECT_SOURCE_DIR}/tests/benchmarks"
-                  DEPENDS cpp2rust libcc2rs
-                  USES_TERMINAL
-                 )
-
 add_custom_target("check"
                   DEPENDS check-libcc2rs check-libcc2rs-macros check-unit
                  )
 
-add_custom_target("check-all"
-                  DEPENDS check check-benchmarks
-                 )
-
 set(RULES_IR_DIR "${CMAKE_BINARY_DIR}/rules")
 
+set(RUSTLS_HEADER "${PROJECT_SOURCE_DIR}/rules/rustls/rustls.h")
+
 file(GLOB rule_subdirs ${PROJECT_SOURCE_DIR}/rules/*)
 set(cpp_rules_ir_outputs)
 set(rust_rules_ir_outputs)
@@ -167,7 +156,7 @@ foreach(_rule_dir IN LISTS rule_subdirs)
     OUTPUT ${_out}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${_out_dir}
     COMMAND $<TARGET_FILE:cpp-rule-preprocessor> --dir ${_rule_dir} --out ${_out}
-    DEPENDS ${_srcs} ${PROJECT_SOURCE_DIR}/cpp2rust/cpp_rule_preprocessor.cpp
+    DEPENDS ${_srcs} ${PROJECT_SOURCE_DIR}/cpp2rust/cpp_rule_preprocessor.cpp ${RUSTLS_HEADER}
     VERBATIM
   )
   list(APPEND cpp_rules_ir_outputs ${_out})
@@ -187,7 +176,7 @@ file(GLOB_RECURSE rule_preprocessor_sources
      ${PROJECT_SOURCE_DIR}/rule-preprocessor/src/*.rs)
 
 add_custom_command(
-  OUTPUT ${rust_rules_ir_outputs}
+  OUTPUT ${rust_rules_ir_outputs} ${RUSTLS_HEADER}
   COMMAND cargo +${RUST_STABLE_VERSION} build --release --manifest-path "${PROJECT_SOURCE_DIR}/rules/Cargo.toml"
   COMMAND ${CMAKE_COMMAND} -E env
           CARGO_TARGET_DIR=${CMAKE_BINARY_DIR}/target_preprocessor

README.md

@@ -118,7 +118,7 @@ Then run:
 ## Test Suite
 
 ```bash
-# Run all tests except benchmarks
+# Run all tests
 ninja check
 
 # Run only the unit tests
@@ -127,12 +127,9 @@ ninja check-unit
 # Run libcc2rs unit tests
 ninja check-libcc2rs
 
-# Run benchmarks (compile & execute)
+# Run libcc2rs-macros unit tests
 ninja check-benchmarks
 
-# Check benchmark output without executing binaries
-SKIP_RUN=1 ninja check-benchmarks
-
 # Regenerate expected output for unit tests after intentional changes
 REPLACE_EXPECTED=1 ninja check-unit
 ```

cmake/generate-buildconfig-py.cmake

@@ -0,0 +1,15 @@
+function(generate_buildconfig_py outdir)
+  file(CONFIGURE
+    OUTPUT "${outdir}/_buildconfig.py"
+    CONTENT [[
+"""Generated by CMake, do not edit."""
+
+from pathlib import Path
+
+CXX = Path(r"@CMAKE_CXX_COMPILER@")
+CC = Path(r"@CMAKE_C_COMPILER@")
+]]
+    ESCAPE_QUOTES
+    @ONLY
+  )
+endfunction()

cpp2rust/CMakeLists.txt

@@ -5,6 +5,7 @@ list(REMOVE_ITEM CORE_SOURCES
 )
 
 add_library(cpp2rust_core STATIC ${CORE_SOURCES})
+llvm_update_compile_flags(cpp2rust_core)
 
 target_link_libraries(cpp2rust_core PUBLIC
     clangAST