Debugger updates

fabioz · Jan 24, 2024 · 92cdcc7 · 92cdcc7
1 parent 5f8e6fa
commit 92cdcc7
Show file tree

Hide file tree

Showing 57 changed files with 54,082 additions and 7,806 deletions.
diff --git a/plugins/org.python.pydev.core/pysrc/.github/workflows/pydevd-tests-python.yml b/plugins/org.python.pydev.core/pysrc/.github/workflows/pydevd-tests-python.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         name: [
           "ubuntu-pypy3",
-          "macos-py37-cython",
+#           "macos-py37-cython", -- misbehaving on github actions
           "ubuntu-py38-cython",
           "windows-py39-cython",
           "windows-py310-cython-checkbin",
@@ -27,13 +27,13 @@ jobs:
 
         include:
           - name: "ubuntu-pypy3"
-            python: "pypy3.8"
+            python: "pypy3.10"
             os: ubuntu-latest
             PYDEVD_USE_CYTHON: NO
-          - name: "macos-py37-cython"
-            python: "3.7"
-            os: macos-latest
-            PYDEVD_USE_CYTHON: YES
+#           - name: "macos-py37-cython"
+#             python: "3.7"
+#             os: macos-latest
+#             PYDEVD_USE_CYTHON: YES
           - name: "ubuntu-py38-cython"
             python: "3.8"
             os: ubuntu-latest
@@ -98,7 +98,7 @@ jobs:
     - name: Install Pandas
       if: contains(matrix.name, 'py310') && !contains(matrix.name, 'pypy')
       # The pandas Styler also requires jinja2. 
-      run: pip install pandas jinja2 --no-warn-script-location
+      run: pip install pandas pyarrow jinja2 --no-warn-script-location
     - name: Install Pypy 3 deps
       if: contains(matrix.name, 'py3')
       run: |

diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_additional_thread_info_regular.py b/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_additional_thread_info_regular.py
@@ -137,7 +137,11 @@ def __str__(self):
 _next_additional_info = [PyDBAdditionalThreadInfo()]
 
 
+# IFDEF CYTHON
+# cpdef set_additional_thread_info(thread):
+# ELSE
 def set_additional_thread_info(thread):
+# ENDIF
     try:
         additional_info = thread.additional_info
         if additional_info is None:

diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_bytecode_utils.py b/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_bytecode_utils.py
@@ -6,8 +6,7 @@
 
 from _pydev_bundle import pydev_log
 from types import CodeType
-from _pydevd_frame_eval.vendored.bytecode.instr import _Variable, TryBegin, \
-    TryEnd, Label
+from _pydevd_frame_eval.vendored.bytecode.instr import _Variable, Label
 from _pydevd_frame_eval.vendored import bytecode
 from _pydevd_frame_eval.vendored.bytecode import cfg as bytecode_cfg
 import dis
@@ -739,8 +738,7 @@ def _get_smart_step_into_targets(code):
     :return list(Target)
     '''
     b = bytecode.Bytecode.from_code(code)
-    # cfg = bytecode_cfg.ControlFlowGraph.from_bytecode(b)
-    cfg = [b]
+    cfg = bytecode_cfg.ControlFlowGraph.from_bytecode(b)
 
     ret = []
 
@@ -749,7 +747,7 @@ def _get_smart_step_into_targets(code):
             print('\nStart block----')
         stack = _StackInterpreter(block)
         for instr in block:
-            if isinstance(instr, (TryBegin, TryEnd, Label)):
+            if isinstance(instr, (Label,)):
                 # No name for these
                 continue
             try: