diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-20 17:01:19 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-08 15:15:48 +0100 |
| commit | ac4e0f0852ce780e143013ceff45067a172e8a83 (patch) | |
| tree | f39eebeb379b6f75e95a333ccec37c4af264d8ee /sapi/phpdbg/phpdbg_frame.c | |
| parent | a555cc0b3d4f745e6d0bb8c595de400a0c728827 (diff) | |
| download | php-git-ac4e0f0852ce780e143013ceff45067a172e8a83.tar.gz | |
Make zend_type a 2-field struct
We now store the pointer payload and the type mask separately. This
is in preparation for union types, where we will be using both at
the same time.
To avoid increasing the size of arginfo structures, the
pass_by_reference and is_variadic fields are now stored as part of
the type_mask (8-bit are reserved for custom use).
Different types of pointer payloads are distinguished based on bits
in the type_mask.
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index d8c7d3941a..453a0d74ba 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -229,7 +229,7 @@ static void phpdbg_dump_prototype(zval *tmp) /* {{{ */ } if (!is_variadic) { - is_variadic = arginfo ? arginfo[j].is_variadic : 0; + is_variadic = arginfo ? ZEND_ARG_IS_VARIADIC(&arginfo[j]) : 0; } phpdbg_xml(" variadic=\"%s\" name=\"%s\">", is_variadic ? "variadic" : "", arg_name ? arg_name : ""); |