From 50f476591f66921fcc7a11b86cbfe62e5c077b16 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 28 Mar 2021 17:17:57 +0100
Subject: [PATCH] .gdbinit: make zbacktrace show the correct stack when
 switching threads

I found this mainly to be a problem when working with threading
extensions. zbacktrace doesn't show the correct stack when switching
threads.

Closes GH-6814.
---
 .gdbinit | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gdbinit b/.gdbinit
index a163bcc4737..1745a81f0a0 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -11,9 +11,7 @@ end
 
 define ____executor_globals
 	if basic_functions_module.zts
-		if !$tsrm_ls
-			set $tsrm_ls = ts_resource_ex(0, 0)
-		end
+		set $tsrm_ls = _tsrm_ls_cache
 		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
 		set $eg_ptr = $eg