revert code sandwich

Girgias · Girgias · commit f5e072dae84d · 2026-04-21T13:29:43.000+01:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -511,13 +511,13 @@ 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 (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;
+	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_BOOL_STATUS_ERROR;
+		}
+		return zend_is_true(arg);
 	}
-	return zend_is_true(arg);
+	return ZPP_PARSE_BOOL_STATUS_ERROR;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -511,13 +511,13 @@ static ZEND_COLD bool zend_null_arg_deprecated(const char *fallback_type, uint32`
`511`	`511`
`512`	`512`	`ZEND_API zpp_parse_bool_status ZEND_FASTCALL zend_parse_arg_bool_weak(const zval arg, uint32_t arg_num) / {{{ */`
`513`	`513`	`{`
`514`		`- if (UNEXPECTED(Z_TYPE_P(arg) > IS_STRING)) {`
`515`		`- return ZPP_PARSE_BOOL_STATUS_ERROR;`
`516`		`- }`
`517`		`- if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("bool", arg_num)) {`
`518`		`- return ZPP_PARSE_BOOL_STATUS_ERROR;`
	`514`	`+ if (EXPECTED(Z_TYPE_P(arg) <= IS_STRING)) {`
	`515`	`+ if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("bool", arg_num)) {`
	`516`	`+ return ZPP_PARSE_BOOL_STATUS_ERROR;`
	`517`	`+ }`
	`518`	`+ return zend_is_true(arg);`
`519`	`519`	`}`
`520`		`- return zend_is_true(arg);`
	`520`	`+ return ZPP_PARSE_BOOL_STATUS_ERROR;`
`521`	`521`	`}`
`522`	`522`	`/* }}} */`
`523`	`523`