Merge pull request #234 from struct/clang-18

test toolchain upgrade to clang 18

Author: struct

.cirrus.yml

@@ -3,7 +3,7 @@ env:
   ARCH: amd64
 
 freebsd_instance:
-  image_family: freebsd-13-2
+  image_family: freebsd-14-3
 
 task:
   name: testsuite-freebsd-amd64

.github/workflows/testsuite.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [12, 13, 14, 15]
+        version: [15, 16, 17, 18]
     steps:
       - uses: actions/checkout@v4
       - run: |
@@ -20,17 +20,17 @@ jobs:
           sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ matrix.version }} 100
       - run: make tests
       - run: make cpp_tests
-  testsuite-clang12-perf:
+  testsuite-clang18-perf:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt install clang-12
+      - run: sudo apt install clang-18
       - run: make malloc_cmp_test
   testsuite-clang-format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt install clang clang-format-12
+      - run: sudo apt install clang clang-format-18
       - run: make format-ci
   testsuite-gcc:
     runs-on: ubuntu-latest

Makefile

@@ -301,8 +301,8 @@ ifneq ($(MEMORY_TAGGING), -DMEMORY_TAGGING=0)
 $(error "Disable software tagging before continuing")
 endif
 
-CC = clang-12
-CXX = clang++-12
+CC = clang-18
+CXX = clang++-18
 endif
 
 HOOKS = $(MALLOC_HOOK)
@@ -487,10 +487,10 @@ install:
 	cp -pR build/$(LIBNAME) /usr/lib/
 
 format:
-	clang-format-12 $(SRC_DIR)/*.* tests/*.* include/*.h -i
+	clang-format-18 $(SRC_DIR)/*.* tests/*.* include/*.h -i
 
 format-ci:
-	clang-format-12 --Werror --dry-run $(SRC_DIR)/*.* tests/*.* include/*.h -i
+	clang-format-18 --Werror --dry-run $(SRC_DIR)/*.* tests/*.* include/*.h -i
 
 clean:
 	rm -rf build/* tests_perf_analysis.txt big_tests_perf_analysis.txt gmon.out \

include/iso_alloc_ds.h

@@ -130,8 +130,8 @@ typedef struct {
      * that holds a specific size in O(1) time */
     zone_lookup_table_t zone_lookup_table[ZONE_LOOKUP_TABLE_SZ];
     /* For chunk sizes >= 1024 our bitmap size is smaller
-    * than a page. This optimization preallocates pages to
-    * hold multiple bitmaps for these zones */
+     * than a page. This optimization preallocates pages to
+     * hold multiple bitmaps for these zones */
     iso_alloc_bitmap_t bitmaps[sizeof(small_bitmap_sizes) / sizeof(int)];
     uint64_t zone_handle_mask;
     uint64_t big_zone_next_mask;

src/iso_alloc.c

@@ -813,7 +813,7 @@ INTERNAL_HIDDEN iso_alloc_zone_t *is_zone_usable(iso_alloc_zone_t *zone, size_t
      * chunks smaller than ZONE_1024 */
     if(size > ZONE_1024 && zone->chunk_size >= (size << WASTED_SZ_MULTIPLIER_SHIFT)) {
         return NULL;
-    } 
+    }
     if(size <= ZONE_1024 && zone->chunk_size > ZONE_1024) {
         return NULL;
     }

src/iso_alloc_mte.c

@@ -5,7 +5,7 @@
 
 /* The majority of this code is adapted from Scudos implementation
  * of ARM MTE support. That code can be found here:
- * https://android.googlesource.com/platform/external/scudo/+/refs/tags/android-14.0.0_r1/standalone/ 
+ * https://android.googlesource.com/platform/external/scudo/+/refs/tags/android-14.0.0_r1/standalone/
  * Its license (The LLVM Project is under the Apache License v2.0 with LLVM Exceptions) can be found here
  * https://android.googlesource.com/platform/external/scudo/+/refs/tags/android-14.0.0_r1/LICENSE.TXT */