Update test_monitoring from v3.14.3

CPython Developers · youknowone · commit 33b66f95c301 · 2026-02-12T14:07:26.000+09:00
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -14,15 +14,8 @@
 import test.support
 from test.support import import_helper, requires_specialization_ft, script_helper
 
-# TODO: RUSTPYTHON - make _testcapi optional so other tests can run
-try:
-    _testcapi = import_helper.import_module("_testcapi")
-except unittest.SkipTest:
-    _testcapi = None
-try:
-    _testinternalcapi = import_helper.import_module("_testinternalcapi")
-except unittest.SkipTest:
-    _testinternalcapi = None
+_testcapi = import_helper.import_module("_testcapi")
+_testinternalcapi = import_helper.import_module("_testinternalcapi")
 
 PAIR = (0,1)
 
@@ -1235,6 +1228,7 @@ def func1():
             ('instruction', 'func1', 16),
             ('line', 'get_events', 11)])
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - instruction offsets differ from CPython
     def test_c_call(self):
 
         def func2():
@@ -1260,6 +1254,7 @@ def func2():
             ('instruction', 'func2', 46),
             ('line', 'get_events', 11)])
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - instruction offsets differ from CPython
     def test_try_except(self):
 
         def func3():
@@ -1557,6 +1552,7 @@ class BranchRightOffsetRecorder(JumpOffsetRecorder):
 class TestBranchAndJumpEvents(CheckEvents):
     maxDiff = None
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - bytecode layout differs from CPython
     def test_loop(self):
 
         def func():
@@ -1622,6 +1618,7 @@ def whilefunc(n=0):
             ('branch left', 'func', 44, 50),
             ('branch right', 'func', 28, 70)])
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - bytecode layout differs from CPython
     def test_except_star(self):
 
         class Foo:
@@ -1667,6 +1664,7 @@ def func():
             ('return', 'func', None),
             ('line', 'get_events', 11)])
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - bytecode layout differs from CPython
     def test_while_offset_consistency(self):
 
         def foo(n=0):
@@ -1684,6 +1682,7 @@ def foo(n=0):
             in_loop,
             exit_loop])
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - bytecode layout differs from CPython
     def test_async_for(self):
 
         def func():
@@ -1708,6 +1707,7 @@ async def foo():
             ('branch left', 'func', 12, 12)])
 
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - bytecode layout differs from CPython
     def test_match(self):
 
         def func(v=1):
@@ -2248,6 +2248,7 @@ def test_func(recorder):
 
 class TestMonitoringAtShutdown(unittest.TestCase):
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; - requires subprocess support
     def test_monitoring_live_at_shutdown(self):
         # gh-115832: An object destructor running during the final GC of
         # interpreter shutdown triggered an infinite loop in the
@@ -2256,7 +2257,6 @@ def test_monitoring_live_at_shutdown(self):
         script_helper.run_test_script(script)
 
 
-@unittest.skipIf(_testcapi is None, "requires _testcapi")  # TODO: RUSTPYTHON
 class TestCApiEventGeneration(MonitoringTestBase, unittest.TestCase):
 
     class Scope:
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -3750,6 +3750,9 @@ impl Compiler {
         is_async: bool,
         funcflags: bytecode::MakeFunctionFlags,
     ) -> CompileResult<()> {
+        // Save source range so MAKE_FUNCTION gets the `def` line, not the body's last line
+        let saved_range = self.current_source_range;
+
         // Always enter function scope
         self.enter_function(name, parameters)?;
         self.current_code_info()
@@ -3803,6 +3806,9 @@ impl Compiler {
         let code = self.exit_scope();
         self.ctx = prev_ctx;
 
+        // Restore source range so MAKE_FUNCTION is attributed to the `def` line
+        self.set_source_range(saved_range);
+
         // Create function object with closure
         self.make_closure(code, funcflags)?;
 
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
