diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-06 14:56:42 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-06 14:56:42 +0200 |
| commit | 7780ba9660248f7caf492c2dc8b4febb08bbb966 (patch) | |
| tree | 8ccdc9ef26cef80e0204b0c383dcb04185cbb3f3 | |
| parent | 741468d145dced618456ad4c4877571083eac3b2 (diff) | |
| download | php-git-7780ba9660248f7caf492c2dc8b4febb08bbb966.tar.gz | |
Try to fix Windows build
| -rw-r--r-- | Zend/zend_execute.c | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 5a5b8e0ad1..d666d6af80 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -585,7 +585,7 @@ static inline void zend_assign_to_variable_reference(zval *variable_ptr, zval *v ZVAL_REF(variable_ptr, ref); } -static zend_never_inline zval* zend_assign_to_typed_property_reference(zend_property_info *prop_info, zval *prop, zval *value_ptr) +static zend_never_inline zval* zend_assign_to_typed_property_reference(zend_property_info *prop_info, zval *prop, zval *value_ptr EXECUTE_DATA_DC) { if (!zend_verify_prop_assignable_by_ref(prop_info, value_ptr, EX_USES_STRICT_TYPES())) { return &EG(uninitialized_zval); @@ -2830,7 +2830,7 @@ static zend_always_inline void zend_assign_to_property_reference(zval *container } if (UNEXPECTED(prop_info)) { - variable_ptr = zend_assign_to_typed_property_reference(prop_info, variable_ptr, value_ptr); + variable_ptr = zend_assign_to_typed_property_reference(prop_info, variable_ptr, value_ptr EXECUTE_DATA_CC); } else { zend_assign_to_variable_reference(variable_ptr, value_ptr); } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 6f58244e52..7f0e97a77a 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2664,7 +2664,7 @@ ZEND_VM_HANDLER(202, ZEND_ASSIGN_STATIC_PROP_REF, ANY, ANY, CACHE_SLOT|SRC) prop = &EG(uninitialized_zval); } } else if (UNEXPECTED(prop_info->type)) { - prop = zend_assign_to_typed_property_reference(prop_info, prop, value_ptr); + prop = zend_assign_to_typed_property_reference(prop_info, prop, value_ptr EXECUTE_DATA_CC); } else { zend_assign_to_variable_reference(prop, value_ptr); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 80c354475b..bc396c60da 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -825,7 +825,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_STATIC_PROP_REF_SPEC_HA prop = &EG(uninitialized_zval); } } else if (UNEXPECTED(prop_info->type)) { - prop = zend_assign_to_typed_property_reference(prop_info, prop, value_ptr); + prop = zend_assign_to_typed_property_reference(prop_info, prop, value_ptr EXECUTE_DATA_CC); } else { zend_assign_to_variable_reference(prop, value_ptr); } |