diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index cf03788d037a81..c13dd59b232ef6 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -77,6 +77,10 @@ def _managed_dict_offset():
     else:
         return -3 * _sizeof_void_p()
 
+def _interp_frame_has_bytecode():
+    interp_frame = gdb.lookup_type("_PyInterpreterFrame")
+    return any(field.name == "bytecode" for field in interp_frame.fields())
+
 
 Py_TPFLAGS_INLINE_VALUES     = (1 << 2)
 Py_TPFLAGS_MANAGED_DICT      = (1 << 4)
@@ -105,6 +109,8 @@ def _managed_dict_offset():
 UNABLE_READ_INFO_PYTHON_FRAME = 'Unable to read information on python frame'
 EVALFRAME = '_PyEval_EvalFrameDefault'
 
+INTERP_FRAME_HAS_BYTECODE = _interp_frame_has_bytecode()
+
 class NullPyObjectPtr(RuntimeError):
     pass
 
@@ -1082,7 +1088,10 @@ def _f_nlocalsplus(self):
     def _f_lasti(self):
         codeunit_p = gdb.lookup_type("_Py_CODEUNIT").pointer()
         instr_ptr = self._gdbval["instr_ptr"]
-        first_instr = self._f_code().field("co_code_adaptive").cast(codeunit_p)
+        if INTERP_FRAME_HAS_BYTECODE:
+            first_instr = self._gdbval["bytecode"].cast(codeunit_p)
+        else:
+            first_instr = self._f_code().field("co_code_adaptive").cast(codeunit_p)
         return int(instr_ptr - first_instr)
 
     def is_shim(self):