Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-103865: add monitoring support to LOAD_SUPER_ATTR #103866

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
carljm merged 17 commits into from
May 16, 2023
Merged

gh-103865: add monitoring support to LOAD_SUPER_ATTR #103866

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
862c3dc
gh-103865: add monitoring support to LOAD_SUPER_ATTR
carljm Apr 26, 2023
d3470cd
Merge branch 'main' into supermon
carljm Apr 26, 2023
82fa183
Merge branch 'main' into supermon
carljm Apr 28, 2023
9f1db4a
fix C raise event
carljm Apr 29, 2023
159b2aa
Merge branch 'main' into supermon
carljm May 1, 2023
e32166d
fix handling error from instrumentation call
carljm May 1, 2023
c48eee3
Merge branch 'main' into supermon
carljm May 9, 2023
c203916
extract _exec and add comment
carljm May 10, 2023
d084043
don't decref global_super before using it
carljm May 10, 2023
8fb9b52
...and update generated cases
carljm May 10, 2023
19b3d9e
Merge branch 'main' into supermon
carljm May 11, 2023
fb47955
Merge branch 'main' into supermon
carljm May 11, 2023
8efd7c6
Merge branch 'main' into supermon
carljm May 12, 2023
9de351f
ensure that our assumptions about the compiler's behavior hold
carljm May 12, 2023
343867a
Merge branch 'main' into supermon
carljm May 15, 2023
a6dd626
Merge branch 'main' into supermon
carljm May 16, 2023
b1f064a
add test verifying equivalence with int()
carljm May 16, 2023
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
ensure that our assumptions about the compiler's behavior hold
  • Loading branch information
@carljm
carljm committed May 12, 2023
commit 9de351fa28aad039891ce7f8a243563053c3f8d9
21 changes: 17 additions & 4 deletions Lib/test/test_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Test suite for the sys.monitoring."""

import collections
import dis
import functools
import operator
import sys
Expand Down Expand Up @@ -507,7 +508,7 @@ def test_lines_single(self):
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
start = LineMonitoringTest.test_lines_single.__code__.co_firstlineno
self.assertEqual(events, [start+7, 15, start+8])
self.assertEqual(events, [start+7, 16, start+8])
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
Expand All @@ -525,7 +526,7 @@ def test_lines_loop(self):
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
start = LineMonitoringTest.test_lines_loop.__code__.co_firstlineno
self.assertEqual(events, [start+7, 22, 23, 22, 23, 22, start+8])
self.assertEqual(events, [start+7, 23, 24, 23, 24, 23, start+8])
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
Expand All @@ -547,7 +548,7 @@ def test_lines_two(self):
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
sys.monitoring.register_callback(TEST_TOOL2, E.LINE, None)
start = LineMonitoringTest.test_lines_two.__code__.co_firstlineno
expected = [start+10, 15, start+11]
expected = [start+10, 16, start+11]
self.assertEqual(events, expected)
self.assertEqual(events2, expected)
finally:
Expand Down Expand Up @@ -1190,10 +1191,22 @@ def _exec(self, codestr, optimized=False):
# un-optimized `LOAD_GLOBAL super; CALL; LOAD_ATTR` form.
assignment = "x = 1" if optimized else "super = super"
codestr = f"{assignment}\n{textwrap.dedent(codestr)}"
co = compile(codestr, "<string>", "exec")
# validate that we really do have a LOAD_SUPER_ATTR, only when optimized
self.assertEqual(self._has_load_super_attr(co), optimized)
d = {}
exec(codestr, d, d)
exec(co, d, d)
return d

def _has_load_super_attr(self, co):
has = any(instr.opname == "LOAD_SUPER_ATTR" for instr in dis.get_instructions(co))
if not has:
has = any(
isinstance(c, types.CodeType) and self._has_load_super_attr(c)
for c in co.co_consts
)
return has

def _super_method_call(self, optimized=False):
codestr = """
class A:
Expand Down