8000 gh-106970: Fix Argument Clinic 'destination <name> clear' command by erlend-aasland · Pull Request #106972 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-106970: Fix Argument Clinic 'destination <name> clear' command #106972

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Jul 22, 2023
Merged

gh-106970: Fix Argument Clinic 'destination <name> clear' command #106972

merged 5 commits into from
Jul 22, 2023

Conversation

erlend-aasland
Copy link
Contributor
@erlend-aasland erlend-aasland commented Jul 21, 2023 •
edited by bedevere-bot
Loading

@erlend-aasland erlend-aasland requested a review from sobolevn July 21, 2023 21:12
@bedevere-bot bedevere-bot mentioned this pull request Jul 21, 2023
Closed
@erlend-aasland erlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jul 21, 2023
@erlend-aasland erlend-aasland mentioned this pull request Jul 21, 2023
Merged
@erlend-aasland
Copy link
Contributor Author

Thanks for the review, Serhiy!

@erlend-aasland erlend-aasland merged commit 3372bcb into python:main Jul 22, 2023
@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.12 only security fixes label Jul 22, 2023
@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3372bcba9893030e4063a9264ec0b4d1b6166883 3.11

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 22, 2023
@erlend-aasland @miss-islington
pythongh-106970: Fix Argument Clinic 'destination <name> clear' comma…
588f331 
…nd (pythonGH-106972)

Add test for the 'destination <name> clear' command,
and the 'destination' directive in general.

Fix two bugs in 'destination <name> clear' command:

1. The text attribute of the allocator is called 'text', not '_text'
2. Return after processing the 'clear' command,
   instead of proceeding directly to the fail().
(cherry picked from commit 3372bcb)

Co-authored-by: Erlend E. Aasland <erlend@python.org>
@bedevere-bot
Copy link

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

Hi! The buildbot AMD64 Arch Linux TraceRefs 3.x has failed when building commit 3372bcb.

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

Failed tests:

  • test__xxsubinterpreters

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

==

Click to see traceback logs 
remote: Enumerating objects: 33, done.        
remote: Counting objects:   3% (1/32)        
remote: Counting objects:   6% (2/32)        
remote: Counting objects:   9% (3/32)        
remote: Counting objects:  12% (4/32)        
remote: Counting objects:  15% (5/32)        
remote: Counting objects:  18% (6/32)        
remote: Counting objects:  21% (7/32)        
remote: Counting objects:  25% (8/32)        
remote: Counting objects:  28% (9/32)        
remote: Counting objects:  31% (10/32)        
remote: Counting objects:  34% (11/32)        
remote: Counting objects:  37% (12/32)        
remote: Counting objects:  40% (13/32)        
remote: Counting objects:  43% (14/32)        
remote: Counting objects:  46% (15/32)        
remote: Counting objects:  50% (16/32)        
remote: Counting objects:  53% (17/32)        
remote: Counting objects:  56% (18/32)        
remote: Counting objects:  59% (19/32)        
remote: Counting objects:  62% (20/32)        
remote: Counting objects:  65% (21/32)        
remote: Counting objects:  68% (22/32)        
remote: Counting objects:  71% (23/32)        
remote: Counting objects:  75% (24/32)        
remote: Counting objects:  78% (25/32)        
remote: Counting objects:  81% (26/32)        
remote: Counting objects:  84% (27/32)        
remote: Counting objects:  87% (28/32)        
remote: Counting objects:  90% (29/32)        
remote: Counting objects:  93% (30/32)        
remote: Counting objects:  96% (31/32)        
remote: Counting objects: 100% (32/32)        
remote: Counting objects: 100% (32/32), done.        
remote: Compressing objects:   3% (1/26)        
remote: Compressing objects:   7% (2/26)        
remote: Compressing objects:  11% (3/26)        
remote: Compressing objects:  15% (4/26)        
remote: Compressing objects:  19% (5/26)        
remote: Compressing objects:  23% (6/26)        
remote: Compressing objects:  26% (7/26)        
remote: Compressing objects:  30% (8/26)        
remote: Compressing objects:  34% (9/26)        
remote: Compressing objects:  38% (10/26)        
remote: Compressing objects:  42% (11/26)        
remote: Compressing objects:  46% (12/26)        
remote: Compressing objects:  50% (13/26)        
remote: Compressing objects:  53% (14/26)        
remote: Compressing objects:  57% (15/26)        
remote: Compressing objects:  61% (16/26)        
remote: Compressing objects:  65% (17/26)        
remote: Compressing objects:  69% (18/26)        
remote: Compressing objects:  73% (19/26)        
remote: Compressing objects:  76% (20/26)        
remote: Compressing objects:  80% (21/26)        
remote: Compressing objects:  84% (22/26)        
remote: Compressing objects:  88% (23/26)        
remote: Compressing objects:  92% (24/26)        
remote: Compressing objects:  96% (25/26)        
remote: Compressing objects: 100% (26/26)        
remote: Compressing objects: 100% (26/26), done.        
remote: Total 33 (delta 8), reused 15 (delta 6), pack-reused 1        
From https://github.com/python/cpython
 * branch                  main       -> FETCH_HEAD
Note: switching to '3372bcba9893030e4063a9264ec0b4d1b6166883'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 3372bcba98 gh-106970: Fix Argument Clinic 'destination <name> clear' command (#106972)
Switched to and reset branch 'main'

Objects/object.c:2234: _Py_ForgetReference: Assertion failed: invalid object chain
Enable tracemalloc to get the memory block allocation traceback

object address  : 0x7f5ac6b6d3f0
object refcount : 0
object type     : 0x55c555ee28c0
object type name: bytes
object repr     : <refcnt 0 at 0x7f5ac6b6d3f0>

Fatal Python error: _PyObject_AssertFailed: _PyObject_AssertFailed
Python runtime state: initialized

Current thread 0x00007f5ad8fb6740 (most recent call first):
  <no Python frame>

Extension modules: _xxsubinterpreters (total: 1)
Debug memory block at address p=0x7f5ad8edde90: API '�'
    18302063728033390045 bytes originally requested
    The 7 pad bytes at p-7 are not all FORBIDDENBYTE (0xfd):
        at p-7: 0xdd *** OUCH
        at p-6: 0xdd *** OUCH
        at p-5: 0xdd *** OUCH
        at p-4: 0xdd *** OUCH
        at p-3: 0xdd *** OUCH
        at p-2: 0xdd *** OUCH
        at p-1: 0xdd *** OUCH
    Because memory is corrupted at the start, the count of bytes requested
       may be bogus, and checking the trailing pad bytes may segfault.
    The 8 pad bytes at tail=0xfdfe7d58d6ebbc6d are Fatal Python error: Segmentation fault

Current thread 0x00007f5ad8fb6740 (most recent call first):
  <no Python frame>

Extension modules: _testcapi, _xxsubinterpreters (total: 2)
make: *** [Makefile:2025: buildbottest] Segmentation fault (core dumped)

Cannot open file '/buildbot/buildarea/3.x.pablogsal-arch-x86_64/build/test-results.xml' for upload

erlend-aasland added a commit that referenced this pull request Jul 22, 2023
@miss-islington @erlend-aasland
[3.12] gh-106970: Fix Argument Clinic 'destination <name> clear' comm…
67748f1 
…and (GH-106972) (#106983)

Add test for the 'destination <name> clear' command,
and the 'destination' directive in general.

Fix two bugs in 'destination <name> clear' command:

1. The text attribute of the allocator is called 'text', not '_text'
2. Return after processing the 'clear' command,
   instead of proceeding directly to the fail().
(cherry picked from commit 3372bcb)

Co-authored-by: Erlend E. Aasland <erlend@python.org>
@erlend-aasland
Copy link
Contributor Author

I'll fix the 3.11 backport later

@erlend-aasland erlend-aasland deleted the clinic/fix-buffer-series-and-dest-clear branch July 22, 2023 09:28
@bedevere-bot
Copy link

GH-107059 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 22, 2023
@erlend-aasland erlend-aasland mentioned this pull request Jul 22, 2023
Merged
erlend-aasland added a commit that referenced this pull request Jul 22, 2023
@erlend-aasland
[3.11] gh-106970: Fix Argument Clinic 'destination <name> clear' comm…
63c945a 
…and (#106972) (#107059)

Add test for the 'destination <name> clear' command,
and the 'destination' directive in general.

Fix two bugs in 'destination <name> clear' command:

1. The text attribute of the allocator is called 'text', not '_text'
2. Return after processing the 'clear' command,
   instead of proceeding directly to the fail().

(cherry picked from commit 3372bcb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@AlexWaygood AlexWaygood Awaiting requested review from AlexWaygood

@sobolevn sobolevn Awaiting requested review from sobolevn

Assignees

@erlend-aasland erlend-aasland

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@erlend-aasland @miss-islington @bedevere-bot @serhiy-storchaka
0