gh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros#101912

zooba

Stops using the macros throughout our core codebase and makes them compatible with previous releases.

Issue: code.h uses MS-only C++ extensions #101907

…de/cpython/code.h

zooba

Posted as a draft because it doesn't build for some reason deep inside macros in generated code in ceval. I'll try to figure it out later

markshannon

Thanks for this. It makes the code a bit easy to reason about.

The change to to _py_set_opcode looks wrong, but otherwise LGTM.

bedevere-bot

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

zooba

I have made the requested changes; please review again

bedevere-bot

Thanks for making the requested changes!

@markshannon: please review the changes made to this pull request.

markshannon

LGTM.

Thanks for doing this.

bedevere-bot

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

Hi! The buildbot ARM64 macOS 3.x has failed when building commit a99eb5c.

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

Failed tests:

test_asyncio

Failed subtests:

test_wait_for_race_condition - test.test_asyncio.test_waitfor.AsyncioWaitForTest.test_wait_for_race_condition

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

== Tests result: FAILURE then FAILURE ==

405 tests OK.

10 slowest tests:

test_signal: 4 min 20 sec
test_concurrent_futures: 2 min 36 sec
test_multiprocessing_spawn: 2 min 8 sec
test_ssl: 1 min 47 sec
test_multiprocessing_forkserver: 1 min 39 sec
test_asyncio: 1 min 29 sec
test_math: 1 min 7 sec
test_logging: 1 min 4 sec
test_capi: 49.7 sec
test_tokenize: 40.5 sec

1 test failed:
test_asyncio

25 tests skipped:
test_check_c_globals test_devpoll test_epoll test_gdb test_idle
test_ioctl test_launcher test_msilib test_multiprocessing_fork
test_ossaudiodev test_peg_generator test_perf_profiler test_spwd
test_startfile test_tcl test_tix test_tkinter test_ttk
test_ttk_textonly test_turtle test_winconsoleio test_winreg
test_winsound test_wmi test_zipfile64

1 re-run test:
test_asyncio

Total duration: 8 min 37 sec

Click to see traceback logs

Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/tasks.py", line 478, in wait_for
    return await fut
           ^^^^^^^^^
asyncio.exceptions.CancelledError


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/unittest/async_case.py", line 90, in _callTestMethod
    if self._callMaybeAsync(method) is not None:
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/unittest/async_case.py", line 112, in _callMaybeAsync
    return self._asyncioRunner.run(
           ^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/runners.py", line 118, in run
    return self._loop.run_until_complete(task)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/base_events.py", line 664, in run_until_complete
    return future.result()
           ^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_asyncio/test_waitfor.py", line 163, in test_wait_for_race_condition
    res = await task
          ^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/tasks.py", line 477, in wait_for
    async with timeouts.timeout(timeout):
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/timeouts.py", line 98, in __aexit__
    raise TimeoutError
TimeoutError

…onGH-101912) * pythongh-101907: Removes use of non-standard C++ extension from Include/cpython/code.h * Make cases_generator correct on Windows

* main: (60 commits) pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078) pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012) pythongh-101566: Sync with zipp 3.14. (pythonGH-102018) pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589) pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161) pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074) pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912) pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949) pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070) pythongh-97786: Fix compiler warnings in pytime.c (python#101826) pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962) Misc improvements to the float tutorial (pythonGH-102052) pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046) pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854) Add missing 'is' to `cmath.log()` docstring (python#102049) pythongh-100210: Correct the comment link for unescaping HTML (python#100212) pythongh-97930: Also include subdirectory in makefile. (python#102030) pythongh-99735: Use required=True in argparse subparsers example (python#100927) Fix incorrectly documented attribute in csv docs (python#101250) pythonGH-84783: Make the slice object hashable (pythonGH-101264) ...

* main: (225 commits) pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078) pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012) pythongh-101566: Sync with zipp 3.14. (pythonGH-102018) pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589) pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161) pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074) pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912) pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949) pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070) pythongh-97786: Fix compiler warnings in pytime.c (python#101826) pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962) Misc improvements to the float tutorial (pythonGH-102052) pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046) pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854) Add missing 'is' to `cmath.log()` docstring (python#102049) pythongh-100210: Correct the comment link for unescaping HTML (python#100212) pythongh-97930: Also include subdirectory in makefile. (python#102030) pythongh-99735: Use required=True in argparse subparsers example (python#100927) Fix incorrectly documented attribute in csv docs (python#101250) pythonGH-84783: Make the slice object hashable (pythonGH-101264) ...

…onGH-101912) * pythongh-101907: Removes use of non-standard C++ extension from Include/cpython/code.h * Make cases_generator correct on Windows

zooba added 3 commits February 14, 2023 15:53

pythongh-101907: Removes use of non-standard C++ extension from Inclu… …

1f5d7cb

…de/cpython/code.h

Use SET macros instead

5005130

Remove macros from internal use instead

b4fd83d

bedevere-bot added the awaiting core review label Feb 14, 2023

bedevere-bot mentioned this pull request Feb 14, 2023

code.h uses MS-only C++ extensions #101907

Closed

zooba added 4 commits February 14, 2023 20:40

Rename macro parameter

a517463

Make cases_generator correct on Windows

2bcfd8d

Fix hash func

c654b35

Merge remote-tracking branch 'cpython/main' into pythongh-101907-2

5edc4d4

zooba marked this pull request as ready for review February 14, 2023 21:53

zooba requested review from iritkatriel and markshannon as code owners February 14, 2023 21:53

zooba mentioned this pull request Feb 14, 2023

gh-101907: Removes use of non-standard C++ extension from Include/cpython/code.h #101909

Closed

markshannon requested changes Feb 15, 2023

View reviewed changes

bedevere-bot added awaiting changes and removed labels Feb 15, 2023

Fix set_opcode and generated file

5d401ed

bedevere-bot added awaiting change review and removed awaiting changes labels Feb 15, 2023

bedevere-bot requested a review from markshannon February 15, 2023 20:50

markshannon merged commit a99eb5c into python:main Feb 20, 2023

bedevere-bot removed the awaiting change review label Feb 20, 2023

zooba deleted the gh-101907-2 branch February 20, 2023 15:32

jaraco mentioned this pull request Feb 20, 2023

gh-88233: zipfile: refactor _strip_extra #102083

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros#101912

gh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros#101912
markshannon merged 8 commits into
python:mainfrom
zooba:gh-101907-2

zooba commented Feb 14, 2023 •

edited by bedevere-bot

Loading

Uh oh!

zooba commented Feb 14, 2023

Uh oh!

markshannon left a comment

Uh oh!

bedevere-bot commented Feb 15, 2023

Uh oh!

zooba commented Feb 15, 2023

Uh oh!

bedevere-bot commented Feb 15, 2023

Uh oh!

markshannon commented Feb 20, 2023

Uh oh!

bedevere-bot commented Feb 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

zooba commented Feb 14, 2023 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zooba commented Feb 14, 2023

Uh oh!

markshannon left a comment

Choose a reason for hiding this comment

Uh oh!

bedevere-bot commented Feb 15, 2023

Uh oh!

zooba commented Feb 15, 2023

Uh oh!

bedevere-bot commented Feb 15, 2023

Uh oh!

markshannon commented Feb 20, 2023

Uh oh!

bedevere-bot commented Feb 20, 2023

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

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

zooba commented Feb 14, 2023 •

edited by bedevere-bot

Loading