Skip to content

bpo-44616: Mark all clean up instructions at end of named exception block as artificial #27109

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.

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
merged 2 commits into from
Jul 14, 2021

Conversation

markshannon
Copy link
Member

@markshannon markshannon commented Jul 13, 2021

@markshannon markshannon changed the title bpo-44570: Mark all clean up instructions at end of named exception block as artificial bpo-44614: Mark all clean up instructions at end of named exception block as artificial Jul 13, 2021
@markshannon markshannon changed the title bpo-44614: Mark all clean up instructions at end of named exception block as artificial bpo-44616: Mark all clean up instructions at end of named exception block as artificial Jul 13, 2021
@markshannon markshannon added the needs backport to 3.10 only security fixes label Jul 13, 2021
Copy link
Member

@pablogsal pablogsal left a comment

Choose a reason for hiding this comment

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

LGTM

Would be great if @nedbat could also confirm that this works for coverage

@@ -3312,11 +3312,11 @@ compiler_try_except(struct compiler *c, stmt_ty s)
/* second # body */
VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
compiler_pop_fblock(c, HANDLER_CLEANUP, cleanup_body);
/* name = None; del name; # Mark as artificial */
Copy link
Member

Choose a reason for hiding this comment

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

Ah, the sneaky cleanup. I knew it has to be it!

@markshannon markshannon merged commit e5862f7 into python:main Jul 14, 2021
@miss-islington
Copy link
Contributor

Thanks @markshannon for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @markshannon, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker e5862f79c16e28f1ec51d179698739a9b2d8c1d2 3.10

@bedevere-bot
Copy link

bedevere-bot commented Jul 14, 2021

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot PPC64 Fedora 3.x has failed when building commit e5862f7.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/237/builds/518) and take a look at the build logs.
  4. Check if the failure is related to this commit (e5862f7) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/237/builds/518

Summary of the results of the build (if available):

Click to see traceback logs
remote: Enumerating objects: 15, done.�[K
remote: Counting objects:   6% (1/15)�[K
remote: Counting objects:  13% (2/15)�[K
remote: Counting objects:  20% (3/15)�[K
remote: Counting objects:  26% (4/15)�[K
remote: Counting objects:  33% (5/15)�[K
remote: Counting objects:  40% (6/15)�[K
remote: Counting objects:  46% (7/15)�[K
remote: Counting objects:  53% (8/15)�[K
remote: Counting objects:  60% (9/15)�[K
remote: Counting objects:  66% (10/15)�[K
remote: Counting objects:  73% (11/15)�[K
remote: Counting objects:  80% (12/15)�[K
remote: Counting objects:  86% (13/15)�[K
remote: Counting objects:  93% (14/15)�[K
remote: Counting objects: 100% (15/15)�[K
remote: Counting objects: 100% (15/15), done.�[K
remote: Compressing objects:  12% (1/8)�[K
remote: Compressing objects:  25% (2/8)�[K
remote: Compressing objects:  37% (3/8)�[K
remote: Compressing objects:  50% (4/8)�[K
remote: Compressing objects:  62% (5/8)�[K
remote: Compressing objects:  75% (6/8)�[K
remote: Compressing objects:  87% (7/8)�[K
remote: Compressing objects: 100% (8/8)�[K
remote: Compressing objects: 100% (8/8), done.�[K
remote: Total 8 (delta 7), reused 0 (delta 0), pack-reused 0�[K
From https://github.com/python/cpython
 * branch            main       -> FETCH_HEAD
Note: checking out 'e5862f79c16e28f1ec51d179698739a9b2d8c1d2'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at e5862f7... [bpo-44616](https://bugs.python.org/issue44616): Mark all clean up instructions at end of named exception block as artificial (GH-27109)
Switched to and reset branch 'main'

./configure: line 10530: PKG_PROG_PKG_CONFIG: command not found
cat: write error: No space left on device

/tmp/ccTwRbIp.s: Assembler messages:
/tmp/ccTwRbIp.s: Fatal error: can't close Parser/peg_api.o: No space left on device
make: *** [Parser/peg_api.o] Error 1

find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
make: [clean-retain-profile] Error 1 (ignored)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants