Call handler directly if it's defined

Author: Girgias

Zend/zend_vm_def.h

@@ -8433,12 +8433,7 @@ ZEND_VM_COLD_CONST_HANDLER(190, ZEND_COUNT, CONST|TMPVAR|CV, UNUSED)
 		zend_object *zobj = Z_OBJ_P(op1);
 		/* First, check if the handler is defined as it is faster */
 		if (zobj->handlers->count_elements) {
-			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
-				zend_type_error("Parameter must be an array or an object that implements Countable");
-			}
-			if (UNEXPECTED(EG(exception))) {
-				count = 0;
-			}
+			zobj->handlers->count_elements(zobj, &count);
 		/* Otherwise check if the object implements Countable and call its count() method */
 		} else if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
 			zval retval;

Zend/zend_vm_execute.h

@@ -9265,12 +9265,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CONST_
 		zend_object *zobj = Z_OBJ_P(op1);
 		/* First, check if the handler is defined as it is faster */
 		if (zobj->handlers->count_elements) {
-			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
-				zend_type_error("Parameter must be an array or an object that implements Countable");
-			}
-			if (UNEXPECTED(EG(exception))) {
-				count = 0;
-			}
+			zobj->handlers->count_elements(zobj, &count);
 		/* Otherwise check if the object implements Countable and call its count() method */
 		} else if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
 			zval retval;
@@ -16280,12 +16275,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_TMPVAR_UNUSED_HANDL
 		zend_object *zobj = Z_OBJ_P(op1);
 		/* First, check if the handler is defined as it is faster */
 		if (zobj->handlers->count_elements) {
-			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
-				zend_type_error("Parameter must be an array or an object that implements Countable");
-			}
-			if (UNEXPECTED(EG(exception))) {
-				count = 0;
-			}
+			zobj->handlers->count_elements(zobj, &count);
 		/* Otherwise check if the object implements Countable and call its count() method */
 		} else if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
 			zval retval;
@@ -45070,12 +45060,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CV_UNUSED_HANDLER(Z
 		zend_object *zobj = Z_OBJ_P(op1);
 		/* First, check if the handler is defined as it is faster */
 		if (zobj->handlers->count_elements) {
-			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
-				zend_type_error("Parameter must be an array or an object that implements Countable");
-			}
-			if (UNEXPECTED(EG(exception))) {
-				count = 0;
-			}
+			zobj->handlers->count_elements(zobj, &count);
 		/* Otherwise check if the object implements Countable and call its count() method */
 		} else if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
 			zval retval;