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.

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

gh-109823: Adjust labels in compiler when removing an empty basic block which is a jump target #109839

Merged
merged 3 commits into from
Sep 25, 2023

Conversation

iritkatriel
Copy link
Member

@iritkatriel iritkatriel commented Sep 25, 2023

@iritkatriel iritkatriel enabled auto-merge (squash) September 25, 2023 17:11
@iritkatriel iritkatriel enabled auto-merge (squash) September 25, 2023 17:54
@iritkatriel iritkatriel merged commit d73c12b into python:main Sep 25, 2023
23 checks passed
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 25, 2023
…ic block which is a jump target (pythonGH-109839)

(cherry picked from commit d73c12b)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Sep 25, 2023

GH-109865 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Sep 25, 2023
@bedevere-bot
Copy link

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

Hi! The buildbot AMD64 Ubuntu Shared 3.x has failed when building commit d73c12b.

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/506/builds/5953) and take a look at the build logs.
  4. Check if the failure is related to this commit (d73c12b) 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/506/builds/5953

Failed tests:

  • test_tools

Failed subtests:

  • test_freeze_simple_script - test.test_tools.test_freeze.TestFreeze.test_freeze_simple_script

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

==

Click to see traceback logs
Traceback (most recent call last):
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/test/test_tools/test_freeze.py", line 32, in test_freeze_simple_script
    outdir, scriptfile, python = helper.prepare(script, outdir)
                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Tools/freeze/test/freeze.py", line 146, in prepare
    copy_source_tree(srcdir, SRCDIR)
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Tools/freeze/test/freeze.py", line 95, in copy_source_tree
    shutil.copytree(oldroot, newroot, ignore=ignore_non_src)
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/shutil.py", line 588, in copytree
    return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/shutil.py", line 542, in _copytree
    raise Error(errors)
shutil.Error: [('/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/build/test_python_96439æ', '/tmp/test_python_fjbrqugj/tmpln7pr78s/cpython/build/test_python_96439æ', "[Errno 2] No such file or directory: '/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/build/test_python_96439æ'")]

Yhg1s pushed a commit that referenced this pull request Sep 26, 2023
…sic block which is a jump target (GH-109839) (#109865)

gh-109823: Adjust labels in compiler when removing an empty basic block which is a jump target (GH-109839)
(cherry picked from commit d73c12b)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
csm10495 pushed a commit to csm10495/cpython that referenced this pull request Sep 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

basicblock_addop Assertion: while-loop with if-expression
5 participants