Commit aef7fa6
committed
Merge upstream CPython main (2e64e36) into parallel-gc-dev
Merge 1,411 upstream commits from python/cpython main into parallel-gc-dev.
Conflicts resolved:
- Modules/Setup.stdlib.in: add both upstream (interpreter.c, tuple.c) and
our (test_ws_deque.c) test module files
- Modules/_testinternalcapi.c: add both Tuple and WSDeque init calls
- Modules/_testinternalcapi/parts.h: add both Tuple and WSDeque declarations
- Python/pylifecycle.c: auto-resolved (upstream JIT/hugepages includes +
our parallel GC includes)
- Python/gc_free_threading.c: auto-resolved by git
Semantic fix applied:
- gc_free_threading_parallel.c: update scan_heap_block_visitor to match
upstream commit 48b6866 which changed long_lived_total counting to include
untracked and frozen objects (was only counting reachable tracked objects).
Also add par_gc_is_frozen() check matching upstream gc_is_frozen().
Configure fix:
- Re-apply --with-parallel-gc patch on clean upstream configure (previous
hand-patched configure had stale rm -f pyconfig.h that broke config.status)
Tested: FTP+flag 121/121 pass, GIL+flag 92/92 pass.1 parent df1cc93 commit aef7fa6
3 files changed
Lines changed: 14 additions & 18 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2613 | 2613 | | |
2614 | 2614 | | |
2615 | 2615 | | |
2616 | | - | |
| 2616 | + | |
2617 | 2617 | | |
2618 | 2618 | | |
2619 | 2619 | | |
| |||
2625 | 2625 | | |
2626 | 2626 | | |
2627 | 2627 | | |
2628 | | - | |
| 2628 | + | |
2629 | 2629 | | |
2630 | 2630 | | |
2631 | 2631 | | |
| |||
2683 | 2683 | | |
2684 | 2684 | | |
2685 | 2685 | | |
2686 | | - | |
| 2686 | + | |
2687 | 2687 | | |
2688 | 2688 | | |
2689 | 2689 | | |
| |||
2695 | 2695 | | |
2696 | 2696 | | |
2697 | 2697 | | |
2698 | | - | |
| 2698 | + | |
2699 | 2699 | | |
2700 | 2700 | | |
2701 | 2701 | | |
| |||
2738 | 2738 | | |
2739 | 2739 | | |
2740 | 2740 | | |
2741 | | - | |
| 2741 | + | |
| 2742 | + | |
| 2743 | + | |
| 2744 | + | |
| 2745 | + | |
| 2746 | + | |
| 2747 | + | |
2742 | 2748 | | |
2743 | 2749 | | |
2744 | 2750 | | |
| |||
2757 | 2763 | | |
2758 | 2764 | | |
2759 | 2765 | | |
| 2766 | + | |
| 2767 | + | |
| 2768 | + | |
2760 | 2769 | | |
2761 | 2770 | | |
2762 | 2771 | | |
2763 | 2772 | | |
2764 | 2773 | | |
2765 | | - | |
2766 | 2774 | | |
2767 | 2775 | | |
2768 | 2776 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments