Skip to content
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

Jump to bottom

GH-104584: Fix ENTER_EXECUTOR #106141

Merged
merged 5 commits into from Jul 3, 2023
Merged

GH-104584: Fix ENTER_EXECUTOR #106141

merged 5 commits into from Jul 3, 2023

Conversation

markshannon
Copy link
Member

@markshannon markshannon commented Jun 27, 2023 •
edited by bedevere-bot

Ensure that the eval-breaker is checked and frame->prev_instr updated before entering executors.

No test changes, or news, as there doesn't seem a way to show that anything is broken.

@bedevere-bot bedevere-bot mentioned this pull request Jun 27, 2023
Open
gvanrossum
gvanrossum reviewed Jun 27, 2023
View reviewed changes
Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

The block headed by // Equivalent to CHECK_EVAL_BREAKER() in _PyUopExecute() towards the end of ceval.c can now also safely be replaced with a call to CHECK_EVAL_BREAKER().

Python/bytecodes.c Outdated Show resolved Hide resolved
Python/ceval.c Outdated Show resolved Hide resolved
gvanrossum
gvanrossum approved these changes Jul 3, 2023
View reviewed changes
Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

Gotta merge (the dreaded make regen-cases), otherwise LGTM. I could use this for one of my further UOP PRs.

@gvanrossum
Copy link
Member

Can you merge this? Or are you planning to run buildbots first?

@markshannon markshannon merged commit e586211 into python:main Jul 3, 2023
19 checks passed
@markshannon markshannon mentioned this pull request Jul 4, 2023
Closed
@carljm carljm mentioned this pull request Aug 21, 2023
Open
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gvanrossum gvanrossum gvanrossum approved these changes

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@markshannon @gvanrossum @bedevere-bot