Skip to content

GH-105848: Replace KW_NAMES + CALL with LOAD_CONST + CALL_KW #109300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandtbucher merged 14 commits into from
Sep 13, 2023
Merged

GH-105848: Replace KW_NAMES + CALL with LOAD_CONST + CALL_KW #109300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e43544
Split things up (sorta)
brandtbucher Aug 11, 2023
b7820ee
Fix all specialization
brandtbucher Aug 12, 2023
0ad7112
Catch up with main
brandtbucher Aug 12, 2023
72d22a4
Catch up with main
brandtbucher Sep 5, 2023
9c8ccf6
Quick hack to fix stats
brandtbucher Sep 5, 2023
4c247af
Catch up with main
brandtbucher Sep 6, 2023
367e7db
Don't specialize CALL_KW
brandtbucher Sep 6, 2023
b0e33b6
More cleanup
brandtbucher Sep 6, 2023
6e6a3b4
Catch up with main
brandtbucher Sep 7, 2023
135a499
Catch up with main
brandtbucher Sep 8, 2023
6cd0318
CALL_NO_KW -> CALL
brandtbucher Sep 8, 2023
53917a5
blurb add
brandtbucher Sep 8, 2023
21b7fef
Feedback from code review
brandtbucher Sep 8, 2023
79f93cd
Catch up with main
brandtbucher Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Catch up with main
  • Loading branch information
@brandtbucher
brandtbucher committed Sep 8, 2023
commit 135a499feceb45900829f59cae75daa02c591d8d
7 changes: 4 additions & 3 deletions Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,9 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.13a1 3557 (Make the conversion to boolean in jumps explicit)
# Python 3.13a1 3558 (Reorder the stack items for CALL)
# Python 3.13a1 3559 (Generate opcode IDs from bytecodes.c)
# Python 3.13a1 3560 (Add CALL_KW and remove KW_NAMES)
# Python 3.13a1 3561 (Add RESUME_CHECK instruction)
# Python 3.13a1 3560 (Add RESUME_CHECK instruction)
# Python 3.13a1 3561 (Add cache entry to branch instructions)
# Python 3.13a1 3562 (Add CALL_KW and remove KW_NAMES)

# Python 3.14 will start with 3600

Expand All @@ -473,7 +474,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.

MAGIC_NUMBER = (3561).to_bytes(2, 'little') + b'\r\n'
Copy link
Copy Markdown
Member

@gvanrossum gvanrossum Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already a merge conflict. :-) Might need to manually merge #109269.

MAGIC_NUMBER = (3562).to_bytes(2, 'little') + b'\r\n'

_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c

Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.