Apply review comments

Author: Girgias

Zend/zend_API.c

@@ -511,20 +511,20 @@ static ZEND_COLD bool zend_null_arg_deprecated(const char *fallback_type, uint32
 
 ZEND_API zpp_parse_bool_status ZEND_FASTCALL zend_parse_arg_bool_weak(const zval *arg, uint32_t arg_num) /* {{{ */
 {
-	if (EXPECTED(Z_TYPE_P(arg) <= IS_STRING)) {
-		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("bool", arg_num)) {
-			return ZPP_PARSE_ERROR;
-		}
-		return zend_is_true(arg);
+	if (UNEXPECTED(Z_TYPE_P(arg) > IS_STRING)) {
+		return ZPP_PARSE_BOOL_STATUS_ERROR;
+	}
+	if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("bool", arg_num)) {
+		return ZPP_PARSE_BOOL_STATUS_ERROR;
 	}
-	return ZPP_PARSE_ERROR;
+	return zend_is_true(arg);
 }
 /* }}} */
 
 ZEND_API zpp_parse_bool_status ZEND_FASTCALL zend_parse_arg_bool_slow(const zval *arg, uint32_t arg_num) /* {{{ */
 {
 	if (UNEXPECTED(ZEND_ARG_USES_STRICT_TYPES())) {
-		return ZPP_PARSE_ERROR;
+		return ZPP_PARSE_BOOL_STATUS_ERROR;
 	}
 	return zend_parse_arg_bool_weak(arg, arg_num);
 }
@@ -533,7 +533,7 @@ ZEND_API zpp_parse_bool_status ZEND_FASTCALL zend_parse_arg_bool_slow(const zval
 ZEND_API zpp_parse_bool_status ZEND_FASTCALL zend_flf_parse_arg_bool_slow(const zval *arg, uint32_t arg_num)
 {
 	if (UNEXPECTED(ZEND_FLF_ARG_USES_STRICT_TYPES())) {
-		return ZPP_PARSE_ERROR;
+		return ZPP_PARSE_BOOL_STATUS_ERROR;
 	}
 	return zend_parse_arg_bool_weak(arg, arg_num);
 }

Zend/zend_API.h

@@ -2171,10 +2171,10 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string
 
 /* Inlined implementations shared by new and old parameter parsing APIs */
 
-typedef enum ZPP_PARSE_BOOL_STATUS {
-	ZPP_PARSE_AS_FALSE = 0,
-	ZPP_PARSE_AS_TRUE = 1,
-	ZPP_PARSE_ERROR = 2,
+typedef enum zpp_parse_bool_status {
+	ZPP_PARSE_BOOL_STATUS_FALSE = 0,
+	ZPP_PARSE_BOOL_STATUS_TRUE = 1,
+	ZPP_PARSE_BOOL_STATUS_ERROR = 2,
 } zpp_parse_bool_status;
 
 ZEND_API bool ZEND_FASTCALL zend_parse_arg_class(zval *arg, zend_class_entry **pce, uint32_t num, bool check_null);
@@ -2213,7 +2213,7 @@ static zend_always_inline bool zend_parse_arg_bool_ex(const zval *arg, bool *des
 		} else {
 			result = zend_parse_arg_bool_slow(arg, arg_num);
 		}
-		if (UNEXPECTED(result == ZPP_PARSE_ERROR)) {
+		if (UNEXPECTED(result == ZPP_PARSE_BOOL_STATUS_ERROR)) {
 			return false;
 		}
 		*dest = result;
@@ -2299,19 +2299,14 @@ static zend_always_inline bool zend_parse_arg_str_ex(zval *arg, zend_string **de
 	} else if (check_null && Z_TYPE_P(arg) == IS_NULL) {
 		*dest = NULL;
 	} else {
-		zend_string *str;
 		if (frameless) {
-			str = zend_flf_parse_arg_str_slow(arg, arg_num);
+			*dest = zend_flf_parse_arg_str_slow(arg, arg_num);
 		} else {
-			str = zend_parse_arg_str_slow(arg, arg_num);
-		}
-		if (str) {
-			*dest = str;
-		} else {
-			return 0;
+			*dest = zend_parse_arg_str_slow(arg, arg_num);
 		}
+		return *dest != NULL;
 	}
-	return 1;
+	return true;
 }
 
 static zend_always_inline bool zend_parse_arg_str(zval *arg, zend_string **dest, bool check_null, uint32_t arg_num)

Zend/zend_execute.c

@@ -772,7 +772,7 @@ static bool zend_verify_weak_scalar_type_hint(uint32_t type_mask, zval *arg)
 	}
 	if ((type_mask & MAY_BE_BOOL) == MAY_BE_BOOL) {
 		zpp_parse_bool_status bval = zend_parse_arg_bool_weak(arg, 0);
-		if (UNEXPECTED(bval == ZPP_PARSE_ERROR)) {
+		if (UNEXPECTED(bval == ZPP_PARSE_BOOL_STATUS_ERROR)) {
 			return false;
 		}
 		zval_ptr_dtor(arg);
@@ -810,7 +810,7 @@ static bool zend_verify_weak_scalar_type_hint_no_sideeffect(uint32_t type_mask,
 	if ((type_mask & MAY_BE_STRING) && can_convert_to_string(arg)) {
 		return true;
 	}
-	if ((type_mask & MAY_BE_BOOL) == MAY_BE_BOOL && zend_parse_arg_bool_weak(arg, (uint32_t)-1) != ZPP_PARSE_ERROR) {
+	if ((type_mask & MAY_BE_BOOL) == MAY_BE_BOOL && zend_parse_arg_bool_weak(arg, (uint32_t)-1) != ZPP_PARSE_BOOL_STATUS_ERROR) {
 		return true;
 	}
 	return false;

Zend/zend_vm_def.h

@@ -8829,8 +8829,8 @@ ZEND_VM_COLD_CONST_HANDLER(121, ZEND_STRLEN, CONST|TMP|CV, ANY)
 		strict = EX_USES_STRICT_TYPES();
 		do {
 			if (EXPECTED(!strict)) {
-				zval tmp;
 				zend_string *str;
+				zval tmp;
 
 				if (UNEXPECTED(Z_TYPE_P(value) == IS_NULL)) {
 					zend_error(E_DEPRECATED,