com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_e xecute.c
| From: | Andrea Faulds | Date: | Mon, 08 Aug 2016 20:00:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: Zend/zend_e xecute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93676@lists.php.net to get a copy of this message | ||
Commit: ab45f13a0b9bebfbc6bfeb7aa9303cd8c62cda69
Author: Andrea Faulds <ajf@ajf.me> Mon, 8 Aug 2016 21:00:49 +0100
Parents: e8d8169fc1d2f5d6a65b9ab29af176c8c8fa2c12 5358c7cf5eda4a4c72e232e22c2f8179f0e8007d
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ab45f13a0b9bebfbc6bfeb7aa9303cd8c62cda69
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM Zend/zend_execute.c
Diff:
diff --cc Zend/zend_execute.c
index a8cb618,1012b3c...234f62a
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -836,11 -823,8 +836,8 @@@ static zend_always_inline int zend_veri
} else {
ce = zend_verify_arg_class_kind(cur_arg_info);
if (UNEXPECTED(!ce)) {
- if (Z_TYPE_P(arg) == IS_OBJECT) {
- zend_verify_arg_error(zf, arg_num, "be an instance of ",
ZSTR_VAL(cur_arg_info->class_name), "instance of ", ZSTR_VAL(Z_OBJCE_P(arg)->name));
- } else {
- zend_verify_arg_error(zf, arg_num, "be an instance of ",
ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg));
- }
+ ZEND_ASSERT(Z_TYPE_P(arg) != IS_OBJECT);
- zend_verify_arg_error(zf, arg_num, "be an instance of ",
ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg), arg);
++ zend_verify_arg_error(zf, arg_num, "be an instance of ",
ZSTR_VAL(cur_arg_info->class_name), "", zend_zval_type_name(arg));
return 0;
}
*cache_slot = (void*)ce;