From: Petr Viktorin <encukou@gmail.com>
Date: Wed, 23 Jul 2025 08:20:42 +0000 (+0200)
Subject: gh-136459: Use platform-specific type in perf_jit_trampoline (GH-137031)
X-Git-Tag: v3.15.0a1~873
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e41c1ce585827f92dab9b7a7fc3df2bda2f817fe;p=thirdparty%2FPython%2Fcpython.git

gh-136459: Use platform-specific type in perf_jit_trampoline (GH-137031)

gh-136461 added perf support for macOS, with ifdefs around all changes
except increasing thread_id to 64 bits.
Make that change Apple-specific too.
---

diff --git a/Python/perf_jit_trampoline.c b/Python/perf_jit_trampoline.c
index 3dcbcd340031..8732be973616 100644
--- a/Python/perf_jit_trampoline.c
+++ b/Python/perf_jit_trampoline.c
@@ -214,7 +214,11 @@ struct BaseEvent {
 typedef struct {
     struct BaseEvent base;   // Common event header
     uint32_t process_id;     // Process ID where code was generated
+#if defined(__APPLE__)
     uint64_t thread_id;      // Thread ID where code was generated
+#else
+    uint32_t thread_id;      // Thread ID where code was generated
+#endif
     uint64_t vma;            // Virtual memory address where code is loaded
     uint64_t code_address;   // Address of the actual machine code
     uint64_t code_size;      // Size of the machine code in bytes