Skip to content

GH-91389: Fix dis position information for CACHEs #93663

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

Merged
brandtbucher merged 7 commits into from
Jun 16, 2022
Merged

GH-91389: Fix dis position information for CACHEs #93663

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
41cfadc
Update tests for intended behavior
brandtbucher Jun 9, 2022
0653bc5
Fix interactions between Positions and CACHEs
brandtbucher Jun 9, 2022
44c742a
blurb add
brandtbucher Jun 10, 2022
986ce3a
make patchcheck
brandtbucher Jun 10, 2022
994d711
Catch up with main
brandtbucher Jun 16, 2022
8266ba9
Feedback from code review
brandtbucher Jun 16, 2022
d500bf2
Naming is hard
brandtbucher Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Feedback from code review
  • Loading branch information
@brandtbucher
brandtbucher committed Jun 16, 2022
commit 8266ba9c658609a25cbe15dd66bc63b4f58878f1
18 changes: 11 additions & 7 deletions Lib/test/test_dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,20 +1756,24 @@ def test_co_positions_missing_info(self):
@requires_debug_ranges()
def test_co_positions_with_lots_of_caches(self):
def roots(a, b, c):
d = (b**2 - 4 * a * c) ** 0.5
yield (-b - d) / (2 * a)
d = b**2 - 4 * a * c
yield (-b - cmath.sqrt(d)) / (2 * a)
if d:
yield (-b + d) / (2 * a)
yield (-b + cmath.sqrt(d)) / (2 * a)
code = roots.__code__
ops = code.co_code[::2]
cache = opcode.opmap["CACHE"]
Copy link
Copy Markdown
Member

@iritkatriel iritkatriel Jun 16, 2022

Choose a reason for hiding this comment

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

Suggested change
cache = opcode.opmap["CACHE"]
cache_opcode = opcode.opmap["CACHE"]

caches = sum(op == cache for op in ops)
non_caches = len(ops) - caches
# Make sure we have "lots of caches". If not, roots should be updated:
assert 1 / 3 <= caches / non_caches, "this test needs more caches!"
for show_caches in (False, True):
for adaptive in (False, True):
with self.subTest(f"{adaptive=}, {show_caches=}"):
co_positions = [
positions
for op, positions in zip(
code.co_code[::2], code.co_positions(), strict=True
)
if show_caches or op != opcode.opmap["CACHE"]
for op, positions in zip(ops, code.co_positions(), strict=True)
if show_caches or op != cache
Copy link
Copy Markdown
Member

@iritkatriel iritkatriel Jun 16, 2022

Choose a reason for hiding this comment

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

Suggested change
if show_caches or op != cache
if show_caches or op != cache_opcode

]
dis_positions = [
instruction.positions
Expand Down