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 /Zend/zend.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 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index ce98f50025..8c9ae86d74 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -594,10 +594,7 @@ static void function_copy_ctor(zval *zv) /* {{{ */ for (i = 0 ; i < num_args; i++) { if (ZEND_TYPE_IS_CLASS(arg_info[i].type)) { zend_string *name = zend_string_dup(ZEND_TYPE_NAME(arg_info[i].type), 1); - - new_arg_info[i].type = - ZEND_TYPE_ENCODE_CLASS( - name, ZEND_TYPE_ALLOW_NULL(arg_info[i].type)); + ZEND_TYPE_SET_PTR(new_arg_info[i].type, name); } } func->common.arg_info = new_arg_info + 1; @@ -968,7 +965,7 @@ static void zend_resolve_property_types(void) /* {{{ */ zend_class_entry *prop_ce = zend_hash_find_ptr(CG(class_table), lc_type_name); ZEND_ASSERT(prop_ce && prop_ce->type == ZEND_INTERNAL_CLASS); - prop_info->type = ZEND_TYPE_ENCODE_CE(prop_ce, ZEND_TYPE_ALLOW_NULL(prop_info->type)); + prop_info->type = (zend_type) ZEND_TYPE_INIT_CE(prop_ce, ZEND_TYPE_ALLOW_NULL(prop_info->type), 0); zend_string_release(lc_type_name); zend_string_release(type_name); } |