GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-91389: Fix show_caches in dis module by 15r10nk · Pull Request #32406 · python/cpython

gh-91389: Fix show_caches in dis module #32406

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

Closed
15r10nk wants to merge 1 commit into python:main from 15r10nk:fix-issue-47233

Uh oh!

There was an error while loading. Please reload this page.
Closed

gh-91389: Fix show_caches in dis module #32406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
82e0ecb
bpo-47233: Fix show_caches in dis module
15r10nk Apr 7, 2022
File filter
Filter by extension
Clear filters
Conversations
Failed to load comments.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Diff view
Diff view

There are no files selected for viewing

4 changes: 3 additions & 1 deletion 4 Lib/dis.py
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,9 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
labels.add(target)
starts_line = None
for offset, op, arg in _unpack_opargs(code):
# get the next position before we skip a CACHE instruction
# to associate the correct position information.
Comment thread

@brandtbucher brandtbucher Apr 14, 2022

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Also, the CI is mad about this trailing whitespace. Didn't see it until now:

Suggested change
# to associate the correct position information.
# to associate the correct position information.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
positions = Positions(*next(co_positions, ()))
Comment thread
15r10nk marked this conversation as resolved.
Resolved

Uh oh!

There was an error while loading. Please reload this page.
if not show_caches and op == CACHE:
continue
if linestarts is not None:
Expand All @@ -422,7 +425,6 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
is_jump_target = offset in labels
argval = None
argrepr = ''
positions = Positions(*next(co_positions, ()))
if arg is not None:
# Set argval to the dereferenced value of the argument when
# available, and argrepr to the string representation of argval.
Expand Down
18 changes: 18 additions & 0 deletions 18 Lib/test/test_dis.py
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,5 +1618,23 @@ def get_disassembly(self, tb):
return output.getvalue()


class TestShowCaches(unittest.TestCase):
def test_show_caches(self):
def example_code():
# this code is never executed
a.b.c(1 * x)
if x:
c = 5

def get_instructions(show_caches):
return [
instr
for instr in dis.Bytecode(example_code, show_caches=show_caches)
if instr.opname != "CACHE"
]

self.assertEqual(get_instructions(True), get_instructions(False))


if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions 2 Misc/NEWS.d/next/Library/2022-04-07-23-31-50.bpo-47233.JMopUw.rst
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix an issue where the default argument ``show_caches=False`` in :mod:`dis`
utilities could result in incorrect position information.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.