Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  .gdbinit: make zbacktrace show the correct stack when switching threads
This commit is contained in:
Nikita Popov 2021-04-05 21:11:19 +02:00
commit 304190c49d

View file

@ -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