From 2e8bc0ef2910964afefd1b344f235cc90a800fdb Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Wed, 29 May 2019 21:18:31 +0200
Subject: [PATCH] bpo-36974: Fix GDB integration

As it changes the way functions are called, the PEP 590 implementation
skipped the functions that the GDB integration is looking for
(by name) to find function calls.

Looking for the new helper `cfunction_call_varargs` hopefully fixes the
tests, and thus buildbots.

The changed frame nuber in test_gdb is due to there being fewer
C calls when calling a built-in method.
---
 Lib/test/test_gdb.py   | 2 +-
 Tools/gdb/libpython.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index dbcb5983e9ba1d..3127e69ca9ba1d 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -887,7 +887,7 @@ def test_pycfunction(self):
                                           breakpoint='time_gmtime',
                                           cmds_after_breakpoint=['py-bt-full'],
                                           )
-        self.assertIn('#2 <built-in method gmtime', gdb_output)
+        self.assertIn('#1 <built-in method gmtime', gdb_output)
 
     @unittest.skipIf(python_is_optimized(),
                      "Python was compiled with optimizations")
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index d744cab7642a75..d49546fa9c46db 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1564,7 +1564,8 @@ def is_other_python_frame(self):
             return False
 
         if caller in ('_PyCFunction_FastCallDict',
-                      '_PyCFunction_FastCallKeywords'):
+                      '_PyCFunction_FastCallKeywords',
+                      'cfunction_call_varargs'):
             arg_name = 'func'
             # Within that frame:
             #   "func" is the local containing the PyObject* of the