Use code object instead of (co_firstlineno, co_name, co_filename) for…

… caching frame info. Fixes microsoft#837 Fixes microsoft#844
fabioz · Feb 24, 2022 · 362ace7 · 362ace7
1 parent ecb43b9
commit 362ace7
Show file tree

Hide file tree

Showing 6 changed files with 351 additions and 389 deletions.
diff --git a/src/Untitled.ipynb b/src/Untitled.ipynb
@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.c b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.c
diff --git a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.pyx b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_cython.pyx
@@ -677,7 +677,7 @@ cdef class PyDBFrame:
         cdef str curr_func_name;
         cdef bint exist_result;
         cdef dict frame_skips_cache;
-        cdef tuple frame_cache_key;
+        cdef object frame_cache_key;
         cdef tuple line_cache_key;
         cdef int breakpoints_in_line_cache;
         cdef int breakpoints_in_frame_cache;
@@ -1640,7 +1640,7 @@ cdef class ThreadTracer:
         cdef str filename;
         cdef str base;
         cdef int pydev_step_cmd;
-        cdef tuple frame_cache_key;
+        cdef object frame_cache_key;
         cdef dict cache_skips;
         cdef bint is_stepping;
         cdef tuple abs_path_canonical_path_and_base;
@@ -1667,7 +1667,7 @@ cdef class ThreadTracer:
 
             # Note: it's important that the context name is also given because we may hit something once
             # in the global context and another in the local context.
-            frame_cache_key = (frame.f_code.co_firstlineno, frame.f_code.co_name, frame.f_code.co_filename)
+            frame_cache_key = frame.f_code
             if frame_cache_key in cache_skips:
                 if not is_stepping:
                     # if DEBUG: print('skipped: trace_dispatch (cache hit)', frame_cache_key, frame.f_lineno, event, frame.f_code.co_name)
@@ -1681,7 +1681,7 @@ cdef class ThreadTracer:
 
                         back_frame = frame.f_back
                         if back_frame is not None and pydev_step_cmd in (107, 144, 109, 160):
-                            back_frame_cache_key = (back_frame.f_code.co_firstlineno, back_frame.f_code.co_name, back_frame.f_code.co_filename)
+                            back_frame_cache_key = back_frame.f_code
                             if cache_skips.get(back_frame_cache_key) == 1:
                                 # if DEBUG: print('skipped: trace_dispatch (cache hit: 1)', frame_cache_key, frame.f_lineno, event, frame.f_code.co_name)
                                 return None if event == 'call' else NO_FTRACE
@@ -1721,7 +1721,7 @@ cdef class ThreadTracer:
                     back_frame = frame.f_back
                     if back_frame is not None and pydev_step_cmd in (107, 144, 109, 160):
                         if py_db.apply_files_filter(back_frame, back_frame.f_code.co_filename, False):
-                            back_frame_cache_key = (back_frame.f_code.co_firstlineno, back_frame.f_code.co_name, back_frame.f_code.co_filename)
+                            back_frame_cache_key = back_frame.f_code
                             cache_skips[back_frame_cache_key] = 1
                             # if DEBUG: print('skipped: trace_dispatch (filtered out: 1)', frame_cache_key, frame.f_lineno, event, frame.f_code.co_name)
                             return None if event == 'call' else NO_FTRACE

diff --git a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_frame.py b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_frame.py
@@ -544,7 +544,7 @@ def _get_unfiltered_back_frame(self, main_debugger, frame):
     #     cdef str curr_func_name;
     #     cdef bint exist_result;
     #     cdef dict frame_skips_cache;
-    #     cdef tuple frame_cache_key;
+    #     cdef object frame_cache_key;
     #     cdef tuple line_cache_key;
     #     cdef int breakpoints_in_line_cache;
     #     cdef int breakpoints_in_frame_cache;

diff --git a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_trace_dispatch_regular.py b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_trace_dispatch_regular.py
@@ -340,7 +340,7 @@ def __call__(self, frame, event, arg):
         # cdef str filename;
         # cdef str base;
         # cdef int pydev_step_cmd;
-        # cdef tuple frame_cache_key;
+        # cdef object frame_cache_key;
         # cdef dict cache_skips;
         # cdef bint is_stepping;
         # cdef tuple abs_path_canonical_path_and_base;
@@ -367,7 +367,7 @@ def __call__(self, frame, event, arg):
 
             # Note: it's important that the context name is also given because we may hit something once
             # in the global context and another in the local context.
-            frame_cache_key = (frame.f_code.co_firstlineno, frame.f_code.co_name, frame.f_code.co_filename)
+            frame_cache_key = frame.f_code
             if frame_cache_key in cache_skips:
                 if not is_stepping:
                     # if DEBUG: print('skipped: trace_dispatch (cache hit)', frame_cache_key, frame.f_lineno, event, frame.f_code.co_name)
@@ -381,7 +381,7 @@ def __call__(self, frame, event, arg):
 
                         back_frame = frame.f_back
                         if back_frame is not None and pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_RETURN, CMD_STEP_RETURN_MY_CODE):
-                            back_frame_cache_key = (back_frame.f_code.co_firstlineno, back_frame.f_code.co_name, back_frame.f_code.co_filename)
+                            back_frame_cache_key = back_frame.f_code
                             if cache_skips.get(back_frame_cache_key) == 1:
                                 # if DEBUG: print('skipped: trace_dispatch (cache hit: 1)', frame_cache_key, frame.f_lineno, event, frame.f_code.co_name)
                                 return None if event == 'call' else NO_FTRACE
@@ -421,7 +421,7 @@ def __call__(self, frame, event, arg):
                     back_frame = frame.f_back
                     if back_frame is not None and pydev_step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_RETURN, CMD_STEP_RETURN_MY_CODE):
                         if py_db.apply_files_filter(back_frame, back_frame.f_code.co_filename, False):
-                            back_frame_cache_key = (back_frame.f_code.co_firstlineno, back_frame.f_code.co_name, back_frame.f_code.co_filename)
+                            back_frame_cache_key = back_frame.f_code
                             cache_skips[back_frame_cache_key] = 1
                             # if DEBUG: print('skipped: trace_dispatch (filtered out: 1)', frame_cache_key, frame.f_lineno, event, frame.f_code.co_name)
                             return None if event == 'call' else NO_FTRACE

diff --git a/src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py b/src/debugpy/_vendored/pydevd/tests_python/test_debugger_json.py
@@ -5988,6 +5988,35 @@ def pandas_mod():
         writer.finished_ok = True
 
 
+def test_same_lineno_and_filename(case_setup, pyfile):
+
+    @pyfile
+    def target():
+
+        def some_code():
+            print('1')  # Break here
+
+        code_obj = compile('''
+        func()
+        ''', __file__, 'exec')
+
+        code_obj = code_obj.replace(co_name=some_code.__code__.co_name, co_firstlineno=some_code.__code__.co_firstlineno)
+        exec(code_obj, {'func': some_code})
+
+        print('TEST SUCEEDED')
+
+    with case_setup.test_file(target) as writer:
+        json_facade = JsonFacade(writer)
+
+        writer.write_add_breakpoint(writer.get_line_index_with_content('Break here'))
+        json_facade.write_launch(justMyCode=False)
+        json_facade.write_make_initial_run()
+
+        json_hit = json_facade.wait_for_thread_stopped()
+        json_facade.write_continue()
+        writer.finished_ok = True
+
+
 if __name__ == '__main__':
     pytest.main(['-k', 'test_case_skipping_filters', '-s'])