com php-src: Replace dead branch with ZEND_ASSERT(): Zend/zend_execute.c
| From: | Andrea Faulds | Date: | Mon, 08 Aug 2016 19:56:11 +0000 |
| Subject: | com php-src: Replace dead branch with ZEND_ASSERT(): Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93675@lists.php.net to get a copy of this message | ||
Commit: 5358c7cf5eda4a4c72e232e22c2f8179f0e8007d
Author: Andrea Faulds <ajf@ajf.me> Mon, 8 Aug 2016 20:56:11 +0100
Parents: 9d03310b2305899965af8902d0bfbf8c7e4c85b0
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5358c7cf5eda4a4c72e232e22c2f8179f0e8007d
Log:
Replace dead branch with ZEND_ASSERT()
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index a7df948..1012b3c 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -823,11 +823,8 @@ static zend_always_inline int zend_verify_arg_type(zend_function *zf, uint32_t
a
} 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),
arg);
- } else {
- 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_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);
return 0;
}
*cache_slot = (void*)ce;