Skip to content

Commit 5eea591

Browse files
Upgrade to LLVM 20
1 parent e449148 commit 5eea591

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

.github/workflows/tail-call.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Beep boop trigger CI
21
name: Tail calling interpreter
32
on:
43
pull_request:
@@ -46,7 +45,7 @@ jobs:
4645
- aarch64-unknown-linux-gnu/gcc
4746
- free-threading
4847
llvm:
49-
- 19
48+
- 20
5049
include:
5150
# - target: i686-pc-windows-msvc/msvc
5251
# architecture: Win32
@@ -84,9 +83,9 @@ jobs:
8483
if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
8584
shell: cmd
8685
run: |
87-
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.5
86+
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
8887
set PlatformToolset=clangcl
89-
set LLVMToolsVersion=${{ matrix.llvm }}.1.5
88+
set LLVMToolsVersion=${{ matrix.llvm }}.1.0
9089
set LLVMInstallDir=C:\Program Files\LLVM
9190
call ./PCbuild/build.bat --tail-call-interp -d -p ${{ matrix.architecture }}
9291
call ./PCbuild/rt.bat -d -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
@@ -96,9 +95,9 @@ jobs:
9695
if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
9796
shell: cmd
9897
run: |
99-
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.5
98+
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
10099
set PlatformToolset=clangcl
101-
set LLVMToolsVersion=${{ matrix.llvm }}.1.5
100+
set LLVMToolsVersion=${{ matrix.llvm }}.1.0
102101
set LLVMInstallDir=C:\Program Files\LLVM
103102
./PCbuild/build.bat --tail-call-interp -p ${{ matrix.architecture }}
104103

Include/internal/pycore_debug_offsets.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,11 @@ extern "C" {
1717

1818
// Macros to burn global values in custom sections so out-of-process
1919
// profilers can locate them easily.
20-
21-
// MSVC+Clang has a bug where it declares it twice.
22-
#if defined(MS_WINDOWS) && defined(__clang__)
23-
# define GENERATE_DEBUG_SECTION(name, declaration) \
24-
_GENERATE_DEBUG_SECTION_WINDOWS(name)
25-
#else
26-
// Everything else
27-
# define GENERATE_DEBUG_SECTION(name, declaration) \
28-
_GENERATE_DEBUG_SECTION_WINDOWS(name) \
29-
_GENERATE_DEBUG_SECTION_APPLE(name) \
30-
declaration \
31-
_GENERATE_DEBUG_SECTION_LINUX(name)
32-
#endif
20+
#define GENERATE_DEBUG_SECTION(name, declaration) \
21+
_GENERATE_DEBUG_SECTION_WINDOWS(name) \
22+
_GENERATE_DEBUG_SECTION_APPLE(name) \
23+
declaration \
24+
_GENERATE_DEBUG_SECTION_LINUX(name)
3325

3426
#if defined(MS_WINDOWS)
3527
#define _GENERATE_DEBUG_SECTION_WINDOWS(name) \

0 commit comments

Comments
 (0)