bpo-39934: Account for control blocks in 'except' in compiler.#22395

markshannon

Pushes an artificial control "block" around the except part of a try-except.
This ensures that the computed depth in the compiler matches the actual depth in the runtime.

https://bugs.python.org/issue39934

serhiy-storchaka

Great work! I was going to write a similar fix, but you did it faster.

I have only comments about the test. The limit is CPython specific, other implementations can have different limit or do not have limit at all. Also, hardcoding the example makes more difficult to change the limit in CPython. I would move the test into separate function decorated with cpython_only and generate code dynamically.

serhiy-storchaka

👍

miss-islington

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

miss-islington

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

miss-islington

Sorry @markshannon, I had trouble checking out the 3.8 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 02d126aa09d96d03dcf9c5b51c858ce5ef386601 3.8

bedevere-bot

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

Hi! The buildbot s390x RHEL8 3.x has failed when building commit 02d126a.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/509/builds/110) and take a look at the build logs.
Check if the failure is related to this commit (02d126a) or if it is a false positive.
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/509/builds/110

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

== Tests result: ENV CHANGED ==

408 tests OK.

10 slowest tests:

test_concurrent_futures: 3 min 24 sec
test_multiprocessing_spawn: 1 min 29 sec
test_gdb: 1 min 25 sec
test_peg_generator: 1 min 19 sec
test_unparse: 1 min 18 sec
test_multiprocessing_forkserver: 1 min 13 sec
test_asyncio: 1 min 10 sec
test_tokenize: 1 min 9 sec
test_capi: 1 min 5 sec
test_multiprocessing_fork: 1 min 3 sec

1 test altered the execution environment:
test_asyncio

14 tests skipped:
test_devpoll test_ioctl test_kqueue test_msilib test_nis
test_ossaudiodev test_startfile test_tix test_tk test_ttk_guionly
test_winconsoleio test_winreg test_winsound test_zipfile64

Total duration: 6 min 35 sec

Click to see traceback logs

Traceback (most recent call last):
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/sslproto.py", line 321, in __del__
    self.close()
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/sslproto.py", line 316, in close
    self._ssl_protocol._start_shutdown()
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/sslproto.py", line 590, in _start_shutdown
    self._abort()
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/sslproto.py", line 731, in _abort
    self._transport.abort()
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/selector_events.py", line 680, in abort
    self._force_close(None)
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/selector_events.py", line 731, in _force_close
    self._loop.call_soon(self._call_connection_lost, exc)
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/base_events.py", line 746, in call_soon
    self._check_closed()
  File "/home/dje/cpython-buildarea/3.x.edelsohn-rhel8-z/build/Lib/asyncio/base_events.py", line 510, in _check_closed
    raise RuntimeError('Event loop is closed')
RuntimeError: Event loop is closed

bedevere-bot

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

Hi! The buildbot aarch64 RHEL8 3.x has failed when building commit 02d126a.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/529/builds/78) and take a look at the build logs.
Check if the failure is related to this commit (02d126a) or if it is a false positive.
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/529/builds/78

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

== Tests result: ENV CHANGED ==

409 tests OK.

10 slowest tests:

test_concurrent_futures: 3 min 38 sec
test_peg_generator: 3 min 1 sec
test_unparse: 2 min 57 sec
test_capi: 2 min 54 sec
test_tokenize: 2 min 32 sec
test_multiprocessing_spawn: 2 min 20 sec
test_gdb: 2 min 10 sec
test_asyncio: 2 min 8 sec
test_lib2to3: 1 min 44 sec
test_multiprocessing_forkserver: 1 min 30 sec

1 test altered the execution environment:
test_asyncio

13 tests skipped:
test_devpoll test_ioctl test_kqueue test_msilib test_ossaudiodev
test_startfile test_tix test_tk test_ttk_guionly test_winconsoleio
test_winreg test_winsound test_zipfile64

Total duration: 6 min 47 sec

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/sslproto.py", line 321, in __del__
    self.close()
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/sslproto.py", line 316, in close
    self._ssl_protocol._start_shutdown()
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/sslproto.py", line 590, in _start_shutdown
    self._abort()
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/sslproto.py", line 731, in _abort
    self._transport.abort()
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/selector_events.py", line 680, in abort
    self._force_close(None)
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/selector_events.py", line 731, in _force_close
    self._loop.call_soon(self._call_connection_lost, exc)
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/base_events.py", line 746, in call_soon
    self._check_closed()
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/asyncio/base_events.py", line 510, in _check_closed
    raise RuntimeError('Event loop is closed')
RuntimeError: Event loop is closed

* origin/master: (113 commits) bpo-41773: Raise exception for non-finite weights in random.choices(). (pythonGH-22441) bpo-41873: Add vectorcall for float() (pythonGH-22432) bpo-41861: Convert _sqlite3 PrepareProtocolType to heap type (pythonGH-22428) bpo-41842: Add codecs.unregister() function (pythonGH-22360) bpo-41875: Use __builtin_unreachable when possible (pythonGH-22433) bpo-40105: ZipFile truncate in append mode with shorter comment (pythonGH-19337) bpo-41870: Use PEP 590 vectorcall to speed up bool() (pythonGH-22427) [doc] Leverage the fact that the actual types can now be indexed for typing (pythonGH-22340) bpo-41861: Convert _sqlite3 cache and node static types to heap types (pythonGH-22417) bpo-41858: Clarify line in optparse doc (pythonGH-22407) Revert "Fix all Python Cookbook links (python#22205)" (pythonGH-22424) bpo-1635741: Port _bisect module to multi-phase init (pythonGH-22415) bpo-41428: Fix compiler warning in unionobject.c (pythonGH-22416) Fix logging error message (pythonGH-22410) bpo-39934: Account for control blocks in 'except' in compiler. (pythonGH-22395) bpo-41775: Make 'IDLE Shell' the shell title (python#22399) bpo-41428: Fix compiler warnings in unionobject.c (pythonGH-22388) bpo-41654: Fix compiler warning in MemoryError_dealloc() (pythonGH-22387) bpo-41833: threading.Thread now uses the target name (pythonGH-22357) bpo-30155: Add macros to get tzinfo from datetime instances (pythonGH-21633) ...

…nGH-22395) * Account for control blocks in 'except' in compiler. Fixes python#39934.

bedevere-bot

GH-23303 is a backport of this pull request to the 3.9 branch.

…H-22395) (GH-23303) * bpo-39934: backport PR 22395 to 3.9

Account for control blocks in 'except' in compiler. Fixes python#39934.

300314b

the-knights-who-say-ni added the CLA signed label Sep 24, 2020

bedevere-bot added the awaiting core review label Sep 24, 2020

markshannon requested a review from serhiy-storchaka September 24, 2020 15:39

serhiy-storchaka reviewed Sep 24, 2020

View reviewed changes

Change nesting test from doctest to unittest.

945e68f

serhiy-storchaka approved these changes Sep 25, 2020

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting core review labels Sep 25, 2020

serhiy-storchaka added needs backport to 3.8 type-bug An unexpected behavior, bug, or error labels Sep 25, 2020

markshannon merged commit 02d126a into python:master Sep 25, 2020

bedevere-bot removed the awaiting merge label Sep 25, 2020

miss-islington assigned markshannon Sep 25, 2020

markshannon deleted the two-for-one-on-excepts branch September 25, 2020 13:04

xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020

bpo-39934: Account for control blocks in 'except' in compiler. (pytho… …

c436e06

…nGH-22395) * Account for control blocks in 'except' in compiler. Fixes python#39934.

bedevere-bot removed the needs backport to 3.9 label Nov 16, 2020

markshannon pushed a commit that referenced this pull request Nov 17, 2020

[3.9] bpo-39934: Account for control blocks in 'except' in compiler. (G… …

48a9c0e

…H-22395) (GH-23303) * bpo-39934: backport PR 22395 to 3.9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-39934: Account for control blocks in 'except' in compiler.#22395

bpo-39934: Account for control blocks in 'except' in compiler.#22395
markshannon merged 2 commits into
python:masterfrom
markshannon:two-for-one-on-excepts

markshannon commented Sep 24, 2020 •

edited by bedevere-bot

Loading

Uh oh!

serhiy-storchaka left a comment

Uh oh!

serhiy-storchaka left a comment

Uh oh!

miss-islington commented Sep 25, 2020

Uh oh!

miss-islington commented Sep 25, 2020

Uh oh!

miss-islington commented Sep 25, 2020

Uh oh!

bedevere-bot commented Sep 25, 2020

Uh oh!

bedevere-bot commented Sep 25, 2020

Uh oh!

bedevere-bot commented Nov 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

markshannon commented Sep 24, 2020 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

miss-islington commented Sep 25, 2020

Uh oh!

miss-islington commented Sep 25, 2020

Uh oh!

miss-islington commented Sep 25, 2020

Uh oh!

bedevere-bot commented Sep 25, 2020

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

Uh oh!

bedevere-bot commented Sep 25, 2020

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

Uh oh!

bedevere-bot commented Nov 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

markshannon commented Sep 24, 2020 •

edited by bedevere-bot

Loading