Merge branch 'PHP-7.0' into PHP-7.1

dereckson · Aug 8, 2016 · ab45f13 · ab45f13
2 parents e8d8169 + 5358c7c
commit ab45f13
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -836,11 +836,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));
-						} 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));
 						return 0;
 					}
 					*cache_slot = (void*)ce;