From: Andrea Faulds <ajf@ajf.me>
Date: Mon, 8 Aug 2016 19:56:11 +0000 (+0100)
Subject: Replace dead branch with ZEND_ASSERT()
X-Git-Tag: php-7.1.0beta3~89^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5358c7cf5eda4a4c72e232e22c2f8179f0e8007d;p=php

Replace dead branch with ZEND_ASSERT()
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index a7df948da2..1012b3cc4f 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;