Skip to content

gh-120225: fix crash in compiler on empty block at end of exception handler #120235

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 5 commits into from
Jun 7, 2024

Conversation

iritkatriel
Copy link
Member

@iritkatriel iritkatriel commented Jun 7, 2024

Fixes #120225.

It's not necessary to set a line number here. It can be propagated later (and if it's not that's also ok, JUMP_NO_INTERRUPT doesn't require a line number).

@iritkatriel iritkatriel added interpreter-core (Objects, Python, Grammar, and Parser dirs) type-crash A hard crash of the interpreter, possibly with a core dump needs backport to 3.13 bugs and security fixes labels Jun 7, 2024
@iritkatriel iritkatriel requested a review from markshannon as a code owner June 7, 2024 15:08
explicit_jump->b_cold = 1;
explicit_jump->b_next = b->b_next;
explicit_jump->b_predecessors = 1;
Copy link
Member Author

Choose a reason for hiding this comment

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

This was missing here - it is needed later for line number propagation to work.

@iritkatriel iritkatriel requested a review from carljm June 7, 2024 20:52
case True:
pass
case name_5 if f'e':
{name_3: name_4 async for name_2 in name_5}
Copy link
Member

Choose a reason for hiding this comment

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

I guess the exception handling block is coming from inlining this comprehension?

@iritkatriel iritkatriel merged commit 4fc82b6 into python:main Jun 7, 2024
38 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 7, 2024
…tion handler (pythonGH-120235)

(cherry picked from commit 4fc82b6)

Co-authored-by: Irit Katriel <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Jun 7, 2024

GH-120249 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jun 7, 2024
iritkatriel added a commit that referenced this pull request Jun 7, 2024
…ption handler (GH-120235) (#120249)

gh-120225: fix crash in compiler on empty block at end of exception handler (GH-120235)
(cherry picked from commit 4fc82b6)

Co-authored-by: Irit Katriel <[email protected]>
@bedevere-bot
Copy link

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

Hi! The buildbot AMD64 Debian root 3.13 has failed when building commit 3be7e91.

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

Failed tests:

  • test_os

Failed subtests:

  • test_timerfd_ns_interval - test.test_os.TimerfdTests.test_timerfd_ns_interval

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

==

Click to see traceback logs
Traceback (most recent call last):
  File "/root/buildarea/3.13.angelico-debian-amd64/build/Lib/test/test_os.py", line 4389, in test_timerfd_ns_interval
    self.assertEqual(self.read_count_signaled(fd), 1)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 2 != 1


Traceback (most recent call last):
  File "/root/buildarea/3.13.angelico-debian-amd64/build/Lib/test/test_os.py", line 4397, in test_timerfd_ns_interval
    self.assertEqual(self.read_count_signaled(fd), count)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 4 != 3

noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
interpreter-core (Objects, Python, Grammar, and Parser dirs) type-crash A hard crash of the interpreter, possibly with a core dump
Projects
None yet
Development

Successfully merging this pull request may close these issues.

flowgraph.c: push_cold_blocks_to_end: Assertion `prev_instr' failed
3 participants