]> granicus.if.org Git - php/commitdiff
Replace dead branch with ZEND_ASSERT()
authorAndrea Faulds <ajf@ajf.me>
Mon, 8 Aug 2016 19:56:11 +0000 (20:56 +0100)
committerAndrea Faulds <ajf@ajf.me>
Mon, 8 Aug 2016 19:56:11 +0000 (20:56 +0100)
Zend/zend_execute.c

index a7df948da20ee1b9040503f6764974267382d222..1012b3cc4fc539892b4d70fc203457593408089b 100644 (file)
@@ -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;