diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-04-06 15:14:29 -0700 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2018-04-06 18:14:29 -0400 |
| commit | 3c193cf8afce525b1283986f113de0e16f23e115 (patch) | |
| tree | 07dae4b7a3bd84a56c7dfa6c88c0b714000a6b86 /Misc/gdbinit | |
| parent | 252f10cbac0132924faed8de44ed7b15e774cbcb (diff) | |
| download | cpython-git-3c193cf8afce525b1283986f113de0e16f23e115.tar.gz | |
[3.7] bpo-29673: fix gdb scripts pystack and pystackv (GH-6126) (GH-6399)
(cherry picked from commit 3a9ccee0e5dbf7d67f5ab79f6095755969db117c)
Co-authored-by: Marcel Plch <gmarcel.plch@gmail.com>
Diffstat (limited to 'Misc/gdbinit')
| -rw-r--r-- | Misc/gdbinit | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Misc/gdbinit b/Misc/gdbinit index 3b6fe50ef9..bb10bdba79 100644 --- a/Misc/gdbinit +++ b/Misc/gdbinit @@ -36,8 +36,8 @@ define pylocals set $_i = 0 while $_i < f->f_code->co_nlocals if f->f_localsplus + $_i != 0 - set $_names = co->co_varnames - set $_name = _PyUnicode_AsString(PyTuple_GetItem($_names, $_i)) + set $_names = f->f_code->co_varnames + set $_name = PyUnicode_AsUTF8(PyTuple_GetItem($_names, $_i)) printf "%s:\n", $_name pyo f->f_localsplus[$_i] end @@ -76,8 +76,8 @@ define pyframev end define pyframe - set $__fn = _PyUnicode_AsString(co->co_filename) - set $__n = _PyUnicode_AsString(co->co_name) + set $__fn = PyUnicode_AsUTF8(f->f_code->co_filename) + set $__n = PyUnicode_AsUTF8(f->f_code->co_name) printf "%s (", $__fn lineno printf "): %s\n", $__n @@ -102,7 +102,7 @@ end #end define printframe - if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx + if $pc > PyEval_EvalFrameEx && $pc < _PyEval_EvalFrameDefault pyframe else frame @@ -129,7 +129,7 @@ end # print the entire Python call stack define pystack while $pc < Py_Main || $pc > Py_GetArgcArgv - if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx + if $pc > PyEval_EvalFrameEx && $pc < _PyEval_EvalFrameDefault pyframe end up-silently 1 @@ -140,7 +140,7 @@ end # print the entire Python call stack - verbose mode define pystackv while $pc < Py_Main || $pc > Py_GetArgcArgv - if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx + if $pc > PyEval_EvalFrameEx && $pc < _PyEval_EvalFrameDefault pyframev end up-silently 1 |