Update pydevd to 2.9.6.

fabioz · Apr 15, 2023 · 819c935 · 819c935
1 parent 0fc4c97
commit 819c935
Show file tree

Hide file tree

Showing 15 changed files with 226 additions and 177 deletions.
diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_collect_bytecode_info.py b/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_collect_bytecode_info.py
@@ -165,7 +165,7 @@ def collect_return_info(co, use_func_first_line=False):
     op_offset_to_line = dict(dis.findlinestarts(co))
     for instruction in iter_instructions(co):
         curr_op_name = instruction.opname
-        if curr_op_name == 'RETURN_VALUE':
+        if curr_op_name in ('RETURN_VALUE', 'RETURN_CONST'):
             lst.append(ReturnInfo(_get_line(op_offset_to_line, instruction.offset, firstlineno, search=True)))
 
     return lst

diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_cython.c b/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_cython.c
diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_daemon_thread.py b/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_daemon_thread.py
@@ -92,7 +92,8 @@ def _patch_threading_to_hide_pydevd_threads():
 
     if found_load_names in (
         {'_active_limbo_lock', '_limbo', '_active', 'values', 'list'},
-        {'_active_limbo_lock', '_limbo', '_active', 'values', 'NULL + list'}
+        {'_active_limbo_lock', '_limbo', '_active', 'values', 'NULL + list'},
+        {'NULL + list', '_active', '_active_limbo_lock', 'NULL|self + values', '_limbo'}
         ):
         pydev_log.debug('Applying patching to hide pydevd threads (Py3 version).')
 

diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_frame_eval/pydevd_frame_evaluator.c b/plugins/org.python.pydev.core/pysrc/_pydevd_frame_eval/pydevd_frame_evaluator.c
diff --git a/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt b/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt
@@ -5,7 +5,7 @@ __version_info__ in pydevd.py
 
 Create tag:
 -----------
-git tag pydev_debugger_2_9_5 -a -m "PyDev.Debugger 2.9.5"
+git tag pydev_debugger_2_9_6 -a -m "PyDev.Debugger 2.9.6"
 git push --tags
 
 

diff --git a/plugins/org.python.pydev.core/pysrc/pydevd.py b/plugins/org.python.pydev.core/pysrc/pydevd.py
@@ -112,7 +112,7 @@
 if USE_CUSTOM_SYS_CURRENT_FRAMES_MAP:
     from _pydevd_bundle.pydevd_constants import constructed_tid_to_last_frame
 
-__version_info__ = (2, 9, 5)
+__version_info__ = (2, 9, 6)
 __version_info_str__ = []
 for v in __version_info__:
     __version_info_str__.append(str(v))

diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_amd64.dll b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_amd64.dll
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_linux_amd64.so b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_linux_amd64.so
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_x86.dll b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_x86.dll
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_x86_64.dylib b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/attach_x86_64.dylib
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/common/py_settrace.hpp b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/common/py_settrace.hpp
@@ -132,7 +132,8 @@ int InternalSetSysTraceFunc(
     DEFINE_PROC(pyEval_CallObjectWithKeywords, PyEval_CallObjectWithKeywords*, "PyEval_CallObjectWithKeywords", 532);
 
     if(pyObject_FastCallDict == nullptr) {
-        DEFINE_PROC_NO_CHECK(pyObject_FastCallDict, _PyObject_FastCallDict*, "PyObject_VectorcallDict", 533);
+        DEFINE_PROC_NO_CHECK(pyObject_VectorcallDict, _PyObject_FastCallDict*, "PyObject_VectorcallDict", 533);
+        pyObject_FastCallDict = pyObject_VectorcallDict;
     }
 
     if(pyObject_FastCallDict == nullptr) {

diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/inject_dll_amd64.exe b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/inject_dll_amd64.exe
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/inject_dll_x86.exe b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/inject_dll_x86.exe
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/run_code_on_dllmain_amd64.dll b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/run_code_on_dllmain_amd64.dll
diff --git a/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/run_code_on_dllmain_x86.dll b/plugins/org.python.pydev.core/pysrc/pydevd_attach_to_process/run_code_on_dllmain_x86.dll