Skip to content

Commit 304190c

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: .gdbinit: make zbacktrace show the correct stack when switching threads
2 parents e0996de + 50f4765 commit 304190c

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

.gdbinit

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ end
1111

1212
define ____executor_globals
1313
if basic_functions_module.zts
14-
if !$tsrm_ls
15-
set $tsrm_ls = ts_resource_ex(0, 0)
16-
end
14+
set $tsrm_ls = _tsrm_ls_cache
1715
set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
1816
set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
1917
set $eg_ptr = $eg

0 commit comments

Comments
 (0)