Fix suppressions

Author: StanFromIreland

.github/workflows/reusable-san.yml

@@ -61,7 +61,7 @@ jobs:
               || ''
             }}.txt handle_segv=0" >> "$GITHUB_ENV"
         else
-          echo "UBSAN_OPTIONS=${SAN_LOG_OPTION} suppressions=${GITHUB_WORKSPACE}/Tools/ubsan/suppressions.txt" >> "$GITHUB_ENV"
+          echo "UBSAN_OPTIONS=${SAN_LOG_OPTION} halt_on_error=1 suppressions=${GITHUB_WORKSPACE}/Tools/ubsan/suppressions.txt" >> "$GITHUB_ENV"
         fi
         echo "CC=clang" >> "$GITHUB_ENV"
         echo "CXX=clang++" >> "$GITHUB_ENV"
@@ -85,7 +85,6 @@ jobs:
       run: make pythoninfo
     - name: Tests
       run: >-
-        UBSAN_OPTIONS="${UBSAN_OPTIONS} halt_on_error=1"
         ./python -m test
         ${{ inputs.sanitizer == 'TSan' && '--tsan' || '' }}
         ${{ inputs.sanitizer == 'UBSan' && '-x test_capi' || '' }}

Tools/ubsan/suppressions.txt

@@ -8,10 +8,10 @@ null:Objects/object.c
 bool:Objects/memoryobject.c
 
 # Modules/binascii.c:1243:42: runtime error: left shift of 128 by 24 places cannot be represented in type 'int'
-shift:Modules/binascii.c
+shift-base:Modules/binascii.c
 
 # Modules/_ctypes/cfield.c:644:1: runtime error: left shift of 1 by 63 places cannot be represented in type 'int64_t' (aka 'long')
-shift:Modules/_ctypes/cfield.c
+shift-base:Modules/_ctypes/cfield.c
 
 # Modules/_zstd/decompressor.c:598:56: runtime error: applying non-zero offset 18446744073709551615 to null pointer
 pointer-overflow:Modules/_zstd/decompressor.c