Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-130574: renumber RESUME opcode from 149 to 128#130685

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
markshannon merged 8 commits intopython:mainfromtom-pytel:fix-issue-130574
Mar 6, 2025

Conversation

@tom-pytel
Copy link
Contributor

@tom-pyteltom-pytel commentedFeb 28, 2025•
edited
Loading

For sure I missed something.

$ ./python -m disdef f(): pass  0           RESUME                   0  1           LOAD_CONST               0 (<code object f at 0x7f20ed6d08b0, file "<stdin>", line 1>)              MAKE_FUNCTION              STORE_NAME               0 (f)              LOAD_CONST               1 (None)              RETURN_VALUEDisassembly of <code object f at 0x7f20ed6d08b0, file "<stdin>", line 1>:  1           RESUME                   0              LOAD_CONST               0 (None)              RETURN_VALUE$ ./pythonPython 3.14.0a5+ (heads/resume-dirty:9f0879baf15, Feb 28 2025, 08:12:35) [GCC 11.4.0] on linuxType "help", "copyright", "credits" or "license" for more information.>>> compile('def f(): pass', '', 'exec')<code object <module> at 0x7f3883ca3140, file "", line 1>>>> _.co_consts(<code object f at 0x7f38838cc4f0, file "", line 1>, None)>>> _[0].co_codeb'\x80\x00P\x00#\x00'

@markshannon
Copy link
Member

Thanks for doing this.

For sure I missed something.

The missing piece is inTools/cases_generator/analyzer.py where the first specialized instruction is hardcoded to 150.
https://github.com/python/cpython/pull/130685/files#diff-bf1d5618934b787df486d8077f48217f17bf4321b9a151528f67b6e6f383976bR1109
it should be set to one more thanRESUME.

min_internal=instmap["RESUME"]+1

With that, all the instructions will be renumbered. You might want to wait until#130643 is merged to reduce the amount of work needed to updatetest_dis.py.

@tom-pytel
Copy link
ContributorAuthor

With that, all the instructions will be renumbered. You might want to wait until#130643 is merged to reduce the amount of work needed to updatetest_dis.py.

Will do.

@markshannon
Copy link
Member

markshannon commentedFeb 28, 2025•
edited
Loading

You'll need to runmake regen-cases

@tom-pytel
Copy link
ContributorAuthor

tom-pytel commentedFeb 28, 2025•
edited
Loading

You'll to runmake regen-cases

I just didregen-all to be sure, there istest_frozenmain, not sure if that is part of the standard compile.

EDIT: Ok, misunderstood you, you meant aftermin_internal change.

@markshannon
Copy link
Member

#130643 is now merged

tom-pytel reacted with thumbs up emoji

@markshannon
Copy link
Member

Looks good. Thanks for doing this.

@markshannonmarkshannon merged commitaeb2327 intopython:mainMar 6, 2025
50 checks passed
@bedevere-bot
Copy link

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

Hi! The buildbotAMD64 Fedora Stable Refleaks 3.x (tier-1) has failed when building commitaeb2327.

What do you need to do:

  1. Don't panic.
  2. Checkthe 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/#/builders/320/builds/2074) and take a look at the build logs.
  4. Check if the failure is related to this commit (aeb2327) 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/#/builders/320/builds/2074

Failed tests:

  • test.test_multiprocessing_spawn.test_manager

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

==

Click to see traceback logs
Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line313, in_bootstrapself.run()~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line108, inrunself._target(*self._args,**self._kwargs)~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/_test_multiprocessing.py", line1625, inf    woken.release()~~~~~~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line1067, inreleasereturnself._callmethod('release')~~~~~~~~~~~~~~~~^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line848, in_callmethodraise convert_to_error(kind, result)multiprocessing.managers.RemoteError: ---------------------------------------------------------------------------Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line264, inserve_clientself.id_to_local_proxy_obj[ident]~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^KeyError:'7f79f00e9950'Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line313, in_bootstrapself.run()~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line108, inrunself._target(*self._args,**self._kwargs)~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/_test_multiprocessing.py", line1625, inf    woken.release()~~~~~~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line1067, inreleasereturnself._callmethod('release')~~~~~~~~~~~~~~~~^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line848, in_callmethodraise convert_to_error(kind, result)multiprocessing.managers.RemoteError: ---------------------------------------------------------------------------Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line264, inserve_clientself.id_to_local_proxy_obj[ident]~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^KeyError:'7fb59ad2b1e0'Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line266, inserve_clientraise ke  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line260, inserve_client    obj, exposed, gettypeid= id_to_obj[ident]~~~~~~~~~^^^^^^^KeyError:'7fcb1ae69950'---------------------------------------------------------------------------kTraceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line313, in_bootstrapself.run()~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line108, inrunself._target(*self._args,**self._kwargs)~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/_test_multiprocessing.py", line1625, inf    woken.release()~~~~~~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line1067, inreleasereturnself._callmethod('release')~~~~~~~~~~~~~~~~^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line848, in_callmethodraise convert_to_error(kind, result)multiprocessing.managers.RemoteError: ---------------------------------------------------------------------------Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line264, inserve_clientself.id_to_local_proxy_obj[ident]~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^KeyError:'7fcb1ae69950'Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line266, inserve_clientraise ke  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line260, inserve_client    obj, exposed, gettypeid= id_to_obj[ident]~~~~~~~~~^^^^^^^KeyError:'7fbe100bd950'---------------------------------------------------------------------------Timeout (0:45:00)!Thread 0x00007f289a392740 (most recent call first):  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/popen_fork.py", line 28 in poll  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/popen_fork.py", line 44 in wait  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line 149 in join  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 623 in _callCleanup  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 697 in doCleanups  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 664 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 716 in __call__  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 122 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 84 in __call__  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 122 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 84 in __call__  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/runner.py", line 259 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 84 in _run_suite  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 42 in run_unittest  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 162 in test_func  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/refleak.py", line 132 in runtest_refleak  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 114 in regrtest_runner  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 165 in _load_run_test  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 210 in _runtest_env_changed_exc  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 319 in _runtest  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 348 in run_single_test  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/worker.py", line 92 in worker_process  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/worker.py", line 127 in main  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/worker.py", line 131 in <module>  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/runpy.py", line 88 in _run_code  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/runpy.py", line 198 in _run_module_as_mainTraceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line266, inserve_clientraise ke  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line260, inserve_client    obj, exposed, gettypeid= id_to_obj[ident]~~~~~~~~~^^^^^^^KeyError:'7fb59ad2b1e0'---------------------------------------------------------------------------kTraceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line266, inserve_clientraise ke  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line260, inserve_client    obj, exposed, gettypeid= id_to_obj[ident]~~~~~~~~~^^^^^^^KeyError:'7f79f00e9950'---------------------------------------------------------------------------Timeout (0:45:00)!Thread 0x00007fcf0a55f740 (most recent call first):  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/popen_fork.py", line 28 in poll  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/popen_fork.py", line 44 in wait  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line 149 in join  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 623 in _callCleanup  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 697 in doCleanups  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 664 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/case.py", line 716 in __call__  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 122 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 84 in __call__  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 122 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/suite.py", line 84 in __call__  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/unittest/runner.py", line 259 in run  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 84 in _run_suite  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 42 in run_unittest  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 162 in test_func  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/refleak.py", line 132 in runtest_refleak  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 114 in regrtest_runner  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 165 in _load_run_test  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 210 in _runtest_env_changed_exc  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 319 in _runtest  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/single.py", line 348 in run_single_test  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/worker.py", line 92 in worker_process  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/worker.py", line 127 in main  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/libregrtest/worker.py", line 131 in <module>  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/runpy.py", line 88 in _run_code  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/runpy.py", line 198 in _run_module_as_mainTraceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line313, in_bootstrapself.run()~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/process.py", line108, inrunself._target(*self._args,**self._kwargs)~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/test/_test_multiprocessing.py", line1625, inf    woken.release()~~~~~~~~~~~~~^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line1067, inreleasereturnself._callmethod('release')~~~~~~~~~~~~~~~~^^^^^^^^^^^  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line848, in_callmethodraise convert_to_error(kind, result)multiprocessing.managers.RemoteError: ---------------------------------------------------------------------------Traceback (most recent call last):  File"/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64.refleak/build/Lib/multiprocessing/managers.py", line264, inserve_clientself.id_to_local_proxy_obj[ident]~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^KeyError:'7fbe100bd950'

@tom-pyteltom-pytel deleted the fix-issue-130574 branchMarch 25, 2025 15:05
seehwan pushed a commit to seehwan/cpython that referenced this pull requestApr 16, 2025
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@markshannonmarkshannonAwaiting requested review from markshannonmarkshannon is a code owner

@ericsnowcurrentlyericsnowcurrentlyAwaiting requested review from ericsnowcurrentlyericsnowcurrently is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tom-pytel@markshannon@bedevere-bot
[8]ページ先頭
©2009-2025 Movatter.jp