From: Nadeshiko Manju <me@manjusaka.me>
Date: Fri, 25 Oct 2024 15:43:02 +0000 (+0800)
Subject: GH-125911: Call combine_symbol_mask on the initial trampoline of a trace (GH-125973)
X-Git-Tag: v3.14.0a2~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f6e884f3acc860c1cf1b773c9659e8f861263e7;p=thirdparty%2FPython%2Fcpython.git

GH-125911: Call combine_symbol_mask on the initial trampoline of a trace (GH-125973)
---

diff --git a/Python/jit.c b/Python/jit.c
index 963bde2303dc..135daeb1b1da 100644
--- a/Python/jit.c
+++ b/Python/jit.c
@@ -473,6 +473,7 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz
     group = &trampoline;
     code_size += group->code_size;
     data_size += group->data_size;
+    combine_symbol_mask(group->trampoline_mask, state.trampolines.mask);
     for (size_t i = 0; i < length; i++) {
         const _PyUOpInstruction *instruction = &trace[i];
         group = &stencil_groups[instruction->opcode];