@@ -106,7 +106,7 @@ patch_one(unsigned char *location, HoleKind kind, uint64_t patch)
106106 * addr = (uint32_t )patch ;
107107 return ;
108108 }
109- case R_386_PC32 :
109+ case R_386_PC32 :
110110 case R_X86_64_GOTPC32 :
111111 case R_X86_64_GOTPCRELX :
112112 case R_X86_64_PC32 :
@@ -255,12 +255,15 @@ initialize_jit(void)
255255 }
256256 uint64_t patches [] = GET_PATCHES ();
257257 patches [_JIT_BODY ] = (uintptr_t )deoptimize_stub ;
258- patches [_JIT_DATA ] = (uintptr_t )deoptimize_stub + stencil -> nbytes ;
258+ patches [_JIT_DATA ] = (uintptr_t )data ;
259259 patches [_JIT_ZERO ] = 0 ;
260260 copy_and_patch (deoptimize_stub , data , stencil , patches );
261261 if (mark_executable (deoptimize_stub , stencil -> nbytes )) {
262262 return needs_initializing ;
263263 }
264+ if (mark_executable (data , stencil -> nbytes_data )) {
265+ return needs_initializing ;
266+ }
264267 }
265268 // Write our error stub:
266269 {
@@ -275,12 +278,15 @@ initialize_jit(void)
275278 }
276279 uint64_t patches [] = GET_PATCHES ();
277280 patches [_JIT_BODY ] = (uintptr_t )error_stub ;
278- patches [_JIT_DATA ] = (uintptr_t )error_stub + stencil -> nbytes ;
281+ patches [_JIT_DATA ] = (uintptr_t )data ;
279282 patches [_JIT_ZERO ] = 0 ;
280283 copy_and_patch (error_stub , data , stencil , patches );
281284 if (mark_executable (error_stub , stencil -> nbytes )) {
282285 return needs_initializing ;
283286 }
287+ if (mark_executable (data , stencil -> nbytes_data )) {
288+ return needs_initializing ;
289+ }
284290 }
285291 // Done:
286292 needs_initializing = 0 ;
@@ -329,16 +335,17 @@ _PyJIT_CompileTrace(_PyUOpInstruction *trace, int size)
329335 return NULL ;
330336 }
331337 unsigned char * head = memory ;
338+ unsigned char * head_data = data ;
332339 // First, the trampoline:
333340 const Stencil * stencil = & trampoline_stencil ;
334341 uint64_t patches [] = GET_PATCHES ();
335342 patches [_JIT_BODY ] = (uintptr_t )head ;
336- patches [_JIT_DATA ] = (uintptr_t )data ;
343+ patches [_JIT_DATA ] = (uintptr_t )head_data ;
337344 patches [_JIT_CONTINUE ] = (uintptr_t )head + stencil -> nbytes ;
338345 patches [_JIT_ZERO ] = 0 ;
339- copy_and_patch (head , data , stencil , patches );
346+ copy_and_patch (head , head_data , stencil , patches );
340347 head += stencil -> nbytes ;
341- data += stencil -> nbytes_data ;
348+ head_data += stencil -> nbytes_data ;
342349 // Then, all of the stencils:
343350 for (int i = 0 ; i < size ; i ++ ) {
344351 _PyUOpInstruction * instruction = & trace [i ];
@@ -355,44 +362,48 @@ _PyJIT_CompileTrace(_PyUOpInstruction *trace, int size)
355362 const Stencil * stencil = & oparg_stencil ;
356363 uint64_t patches [] = GET_PATCHES ();
357364 patches [_JIT_BODY ] = (uintptr_t )head ;
358- patches [_JIT_DATA ] = (uintptr_t )data ;
365+ patches [_JIT_DATA ] = (uintptr_t )head_data ;
359366 patches [_JIT_CONTINUE ] = (uintptr_t )head + stencil -> nbytes ;
360367 patches [_JIT_OPARG ] = instruction -> oparg ;
361368 patches [_JIT_ZERO ] = 0 ;
362- copy_and_patch (head , data , stencil , patches );
369+ copy_and_patch (head , head_data , stencil , patches );
363370 head += stencil -> nbytes ;
364- data += stencil -> nbytes_data ;
371+ head_data += stencil -> nbytes_data ;
365372 }
366373 if (OPCODE_HAS_OPERAND (instruction -> opcode )) {
367374 const Stencil * stencil = & operand_stencil ;
368375 uint64_t patches [] = GET_PATCHES ();
369376 patches [_JIT_BODY ] = (uintptr_t )head ;
370- patches [_JIT_DATA ] = (uintptr_t )data ;
377+ patches [_JIT_DATA ] = (uintptr_t )head_data ;
371378 patches [_JIT_CONTINUE ] = (uintptr_t )head + stencil -> nbytes ;
372379 patches [_JIT_OPERAND ] = instruction -> operand ;
373380 patches [_JIT_ZERO ] = 0 ;
374- copy_and_patch (head , data , stencil , patches );
381+ copy_and_patch (head , head_data , stencil , patches );
375382 head += stencil -> nbytes ;
376- data += stencil -> nbytes_data ;
383+ head_data += stencil -> nbytes_data ;
377384 }
378385 const Stencil * stencil = & stencils [instruction -> opcode ];
379386 uint64_t patches [] = GET_PATCHES ();
380387 patches [_JIT_BODY ] = (uintptr_t )head ;
381- patches [_JIT_DATA ] = (uintptr_t )data ;
388+ patches [_JIT_DATA ] = (uintptr_t )head_data ;
382389 patches [_JIT_CONTINUE ] = (uintptr_t )head + stencil -> nbytes ;
383390 patches [_JIT_DEOPTIMIZE ] = (uintptr_t )deoptimize_stub ;
384391 patches [_JIT_ERROR ] = (uintptr_t )error_stub ;
385392 patches [_JIT_JUMP ] = (uintptr_t )memory + offsets [instruction -> oparg % size ];
386393 patches [_JIT_ZERO ] = 0 ;
387- copy_and_patch (head , data , stencil , patches );
394+ copy_and_patch (head , head_data , stencil , patches );
388395 head += stencil -> nbytes ;
389- data += stencil -> nbytes_data ;
396+ head_data += stencil -> nbytes_data ;
390397 };
391398 PyMem_Free (offsets );
392399 if (mark_executable (memory , nbytes )) {
393400 return NULL ;
394401 }
402+ if (mark_executable (data , nbytes_data )) {
403+ return needs_initializing ;
404+ }
395405 // Wow, done already?
396406 assert (memory + nbytes == head );
407+ assert (data + nbytes_data == head_data );
397408 return (_PyJITFunction )memory ;
398409}
0 commit comments