com php-src: Get rid of zend_verify_scalar_property_typ e(), use common zend_verify_scalar_property _type() instead.: Zend/zend_execute.c

From: Date: Tue, 24 May 2016 14:17:22 +0000
Subject: com php-src: Get rid of zend_verify_scalar_property_typ e(), use common zend_verify_scalar_property _type() instead.: Zend/zend_execute.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95540@lists.php.net to get a copy of this message
Commit: 4aae93828eb2533f64ec742889e4a0062f000723 Author: Dmitry Stogov <dmitry@zend.com> Tue, 24 May 2016 17:17:22 +0300 Parents: a1e3ea301694caa26a1bb46d01e3842790796bc1 Branches: typed_ref_properties Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4aae93828eb2533f64ec742889e4a0062f000723 Log: Get rid of zend_verify_scalar_property_type(), use common zend_verify_scalar_property_type() instead. Changed paths: M Zend/zend_execute.c Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index ac76625..857937d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -812,24 +812,6 @@ static int zend_verify_internal_arg_type(zend_function *zf, uint32_t arg_num, zv return 1; } -static inline zend_bool zend_verify_scalar_property_type(zend_uchar type, zval *property, zend_bool strict) { - if (EXPECTED(!strict)) { - if (UNEXPECTED(!ZEND_SAME_FAKE_TYPE(type, Z_TYPE_P(property)))) { - return zend_verify_weak_scalar_type_hint(type, property); - } - return 1; - } - - if (UNEXPECTED(type == IS_DOUBLE && Z_TYPE_P(property) == IS_LONG)) { - double dest = (double) Z_LVAL_P(property); - zval_ptr_dtor(property); - ZVAL_DOUBLE(property, dest); - return 1; - } - - return ZEND_SAME_FAKE_TYPE(type, Z_TYPE_P(property)); -} - ZEND_COLD zend_never_inline void zend_verify_property_type_error(zend_property_info *info, zend_string *name, zval *property) { zend_string *resolved = zend_resolve_property_type(info->type_name, info->ce); @@ -895,7 +877,7 @@ zend_bool zend_verify_property_type(zend_property_info *info, zval *property, ze } default: - return zend_verify_scalar_property_type(info->type, property, strict); + return zend_verify_scalar_type_hint(info->type, property, strict); } }

« previous php.cvs (#95540) next »