Fix GCC warning when using getThis() in a conditional (#13923)

arnaud-lb · web-flow · commit fd73681c86bb · 2024-04-09T19:09:07.000+02:00
Since GCC 12.x, using getThis() in a conditional yields a warning:

    &lt;source&gt;:12:22: warning: the comparison will always evaluate as 'true' for
                    the address of 'This' will never be NULL [-Waddress]
       12 |     return getThis() ? 2 : 3;
          |                      ^
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
@@ -521,7 +521,8 @@ ZEND_API const char *zend_get_type_by_const(int type);
 
 #define ZEND_THIS                           (&EX(This))
 
-#define getThis()							((Z_TYPE_P(ZEND_THIS) == IS_OBJECT) ? ZEND_THIS : NULL)
+#define hasThis()							(Z_TYPE_P(ZEND_THIS) == IS_OBJECT)
+#define getThis()							(hasThis() ? ZEND_THIS : NULL)
 #define ZEND_IS_METHOD_CALL()				(EX(func)->common.scope != NULL)
 
 #define WRONG_PARAM_COUNT					ZEND_WRONG_PARAM_COUNT()
diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
@@ -44,21 +44,21 @@ using icu::Locale;
 
 #define ZEND_VALUE_ERROR_INVALID_FIELD(argument, zpp_arg_position) \
 	if (argument < 0 || argument >= UCAL_FIELD_COUNT) { \
-		zend_argument_value_error(getThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \
+		zend_argument_value_error(hasThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \
 			"must be a valid field"); \
 		RETURN_THROWS(); \
 	}
 
 #define ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(argument, zpp_arg_position) \
 	if (UNEXPECTED(argument < INT32_MIN || argument > INT32_MAX)) { \
-		zend_argument_value_error(getThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \
+		zend_argument_value_error(hasThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \
 			"must be between %d and %d", INT32_MIN, INT32_MAX); \
 		RETURN_THROWS(); \
 	}
 
 #define ZEND_VALUE_ERROR_INVALID_DAY_OF_WEEK(argument, zpp_arg_position) \
 	if (argument < UCAL_SUNDAY || argument > UCAL_SATURDAY) { \
-		zend_argument_value_error(getThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \
+		zend_argument_value_error(hasThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \
 			"must be a valid day of the week"); \
 		RETURN_THROWS(); \
 	}
@@ -641,7 +641,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_locale)
 	}
 
 	if (locale_type != ULOC_ACTUAL_LOCALE && locale_type != ULOC_VALID_LOCALE) {
-		zend_argument_value_error(getThis() ? 1 : 2, "must be either Locale::ACTUAL_LOCALE or Locale::VALID_LOCALE");
+		zend_argument_value_error(hasThis() ? 1 : 2, "must be either Locale::ACTUAL_LOCALE or Locale::VALID_LOCALE");
 		RETURN_THROWS();
 	}
 
@@ -886,7 +886,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_minimal_days_in_first_week)
 
 	// Use ZEND_VALUE_ERROR_INVALID_DAY_OF_WEEK ?
 	if (num_days < 1 || num_days > 7) {
-		zend_argument_value_error(getThis() ? 1 : 2, "must be between 1 and 7");
+		zend_argument_value_error(hasThis() ? 1 : 2, "must be between 1 and 7");
 		RETURN_THROWS();
 	}
 
@@ -961,7 +961,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_repeated_wall_time_option)
 	}
 
 	if (option != UCAL_WALLTIME_FIRST && option != UCAL_WALLTIME_LAST) {
-		zend_argument_value_error(getThis() ? 1 : 2, "must be either IntlCalendar::WALLTIME_FIRST or "
+		zend_argument_value_error(hasThis() ? 1 : 2, "must be either IntlCalendar::WALLTIME_FIRST or "
 			"IntlCalendar::WALLTIME_LAST");
 		RETURN_THROWS();
 	}
@@ -985,7 +985,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_skipped_wall_time_option)
 
 	if (option != UCAL_WALLTIME_FIRST && option != UCAL_WALLTIME_LAST
 			&& option != UCAL_WALLTIME_NEXT_VALID) {
-		zend_argument_value_error(getThis() ? 1 : 2, "must be one of IntlCalendar::WALLTIME_FIRST, "
+		zend_argument_value_error(hasThis() ? 1 : 2, "must be one of IntlCalendar::WALLTIME_FIRST, "
 			"IntlCalendar::WALLTIME_LAST, or IntlCalendar::WALLTIME_NEXT_VALID");
 		RETURN_THROWS();
 	}
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -178,7 +178,7 @@ static void _php_intlgregcal_constructor_body(
 	} else {
 		// From date/time (3, 5 or 6 arguments)
 		for (int i = 0; i < variant; i++) {
-			ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], getThis() ? (i-1) : i);
+			ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], hasThis() ? (i-1) : i);
 		}
 
 		if (variant == 3) {
@@ -348,7 +348,7 @@ U_CFUNC PHP_FUNCTION(intlgregcal_is_leap_year)
 	}
 
 	if (UNEXPECTED(year < INT32_MIN || year > INT32_MAX)) {
-		zend_argument_value_error(getThis() ? 1 : 2, "must be between %d and %d", INT32_MIN, INT32_MAX);
+		zend_argument_value_error(hasThis() ? 1 : 2, "must be between %d and %d", INT32_MIN, INT32_MAX);
 		RETURN_THROWS();
 	}
 
diff --git a/ext/intl/formatter/formatter_format.c b/ext/intl/formatter/formatter_format.c
@@ -114,7 +114,7 @@ PHP_FUNCTION( numfmt_format )
 			}
 			RETURN_THROWS();
 		default:
-			zend_argument_value_error(getThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");
+			zend_argument_value_error(hasThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");
 			RETURN_THROWS();
 	}
 
diff --git a/ext/intl/formatter/formatter_parse.c b/ext/intl/formatter/formatter_parse.c
@@ -96,7 +96,7 @@ PHP_FUNCTION( numfmt_parse )
 			}
 			goto cleanup;
 		default:
-			zend_argument_value_error(getThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");
+			zend_argument_value_error(hasThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");
 			goto cleanup;
 	}
 
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -49,7 +49,7 @@ static PHP_GINIT_FUNCTION(mysqli);
 	} \
 }
 
-#define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+#define ERROR_ARG_POS(arg_num) (hasThis() ? (arg_num-1) : (arg_num))
 
 static HashTable classes;
 static zend_object_handlers mysqli_object_handlers;
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
@@ -31,7 +31,7 @@
 #include "mysqli_priv.h"
 #include "ext/mysqlnd/mysql_float_to_double.h"
 
-#define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+#define ERROR_ARG_POS(arg_num) (hasThis() ? (arg_num-1) : (arg_num))
 
 /* {{{ Get number of affected rows in previous MySQL operation */
 PHP_FUNCTION(mysqli_affected_rows)
@@ -157,7 +157,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
 		RETURN_THROWS();
 	}
 
-	RETVAL_BOOL(!mysqli_stmt_bind_param_do_bind(stmt, argc, args, types, getThis() ? 1 : 2));
+	RETVAL_BOOL(!mysqli_stmt_bind_param_do_bind(stmt, argc, args, types, hasThis() ? 1 : 2));
 	MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
 }
 /* }}} */
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
@@ -28,7 +28,7 @@
 #include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
-#define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+#define ERROR_ARG_POS(arg_num) (hasThis() ? (arg_num-1) : (arg_num))
 
 #define SAFE_STR(a) ((a)?a:"")
 
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
@@ -1176,7 +1176,7 @@ PHP_FUNCTION(tidy_get_opt_doc)
 	opt = tidyGetOptionByName(obj->ptdoc->doc, optname);
 
 	if (!opt) {
-		zend_argument_value_error(getThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);
+		zend_argument_value_error(hasThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);
 		RETURN_THROWS();
 	}
 
@@ -1320,7 +1320,7 @@ PHP_FUNCTION(tidy_getopt)
 	opt = tidyGetOptionByName(obj->ptdoc->doc, optname);
 
 	if (!opt) {
-		zend_argument_value_error(getThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);
+		zend_argument_value_error(hasThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);
 		RETURN_THROWS();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -44,21 +44,21 @@ using icu::Locale;`
`44`	`44`
`45`	`45`	`#define ZEND_VALUE_ERROR_INVALID_FIELD(argument, zpp_arg_position) \`
`46`	`46`	`if (argument < 0 \|\| argument >= UCAL_FIELD_COUNT) { \`
`47`		`- zend_argument_value_error(getThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \`
	`47`	`+ zend_argument_value_error(hasThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \`
`48`	`48`	`"must be a valid field"); \`
`49`	`49`	`RETURN_THROWS(); \`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`#define ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(argument, zpp_arg_position) \`
`53`	`53`	`if (UNEXPECTED(argument < INT32_MIN \|\| argument > INT32_MAX)) { \`
`54`		`- zend_argument_value_error(getThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \`
	`54`	`+ zend_argument_value_error(hasThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \`
`55`	`55`	`"must be between %d and %d", INT32_MIN, INT32_MAX); \`
`56`	`56`	`RETURN_THROWS(); \`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`#define ZEND_VALUE_ERROR_INVALID_DAY_OF_WEEK(argument, zpp_arg_position) \`
`60`	`60`	`if (argument < UCAL_SUNDAY \|\| argument > UCAL_SATURDAY) { \`
`61`		`- zend_argument_value_error(getThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \`
	`61`	`+ zend_argument_value_error(hasThis() ? ((zpp_arg_position)-1) : zpp_arg_position, \`
`62`	`62`	`"must be a valid day of the week"); \`
`63`	`63`	`RETURN_THROWS(); \`
`64`	`64`	`}`
`@@ -641,7 +641,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_locale)`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`if (locale_type != ULOC_ACTUAL_LOCALE && locale_type != ULOC_VALID_LOCALE) {`
`644`		`- zend_argument_value_error(getThis() ? 1 : 2, "must be either Locale::ACTUAL_LOCALE or Locale::VALID_LOCALE");`
	`644`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "must be either Locale::ACTUAL_LOCALE or Locale::VALID_LOCALE");`
`645`	`645`	`RETURN_THROWS();`
`646`	`646`	`}`
`647`	`647`
`@@ -886,7 +886,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_minimal_days_in_first_week)`
`886`	`886`
`887`	`887`	`// Use ZEND_VALUE_ERROR_INVALID_DAY_OF_WEEK ?`
`888`	`888`	`if (num_days < 1 \|\| num_days > 7) {`
`889`		`- zend_argument_value_error(getThis() ? 1 : 2, "must be between 1 and 7");`
	`889`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "must be between 1 and 7");`
`890`	`890`	`RETURN_THROWS();`
`891`	`891`	`}`
`892`	`892`
`@@ -961,7 +961,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_repeated_wall_time_option)`
`961`	`961`	`}`
`962`	`962`
`963`	`963`	`if (option != UCAL_WALLTIME_FIRST && option != UCAL_WALLTIME_LAST) {`
`964`		`- zend_argument_value_error(getThis() ? 1 : 2, "must be either IntlCalendar::WALLTIME_FIRST or "`
	`964`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "must be either IntlCalendar::WALLTIME_FIRST or "`
`965`	`965`	`"IntlCalendar::WALLTIME_LAST");`
`966`	`966`	`RETURN_THROWS();`
`967`	`967`	`}`
`@@ -985,7 +985,7 @@ U_CFUNC PHP_FUNCTION(intlcal_set_skipped_wall_time_option)`
`985`	`985`
`986`	`986`	`if (option != UCAL_WALLTIME_FIRST && option != UCAL_WALLTIME_LAST`
`987`	`987`	`&& option != UCAL_WALLTIME_NEXT_VALID) {`
`988`		`- zend_argument_value_error(getThis() ? 1 : 2, "must be one of IntlCalendar::WALLTIME_FIRST, "`
	`988`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "must be one of IntlCalendar::WALLTIME_FIRST, "`
`989`	`989`	`"IntlCalendar::WALLTIME_LAST, or IntlCalendar::WALLTIME_NEXT_VALID");`
`990`	`990`	`RETURN_THROWS();`
`991`	`991`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ static void _php_intlgregcal_constructor_body(`
`178`	`178`	`} else {`
`179`	`179`	`// From date/time (3, 5 or 6 arguments)`
`180`	`180`	`for (int i = 0; i < variant; i++) {`
`181`		`- ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], getThis() ? (i-1) : i);`
	`181`	`+ ZEND_VALUE_ERROR_OUT_OF_BOUND_VALUE(largs[i], hasThis() ? (i-1) : i);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (variant == 3) {`
`@@ -348,7 +348,7 @@ U_CFUNC PHP_FUNCTION(intlgregcal_is_leap_year)`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`if (UNEXPECTED(year < INT32_MIN \|\| year > INT32_MAX)) {`
`351`		`- zend_argument_value_error(getThis() ? 1 : 2, "must be between %d and %d", INT32_MIN, INT32_MAX);`
	`351`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "must be between %d and %d", INT32_MIN, INT32_MAX);`
`352`	`352`	`RETURN_THROWS();`
`353`	`353`	`}`
`354`	`354`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ PHP_FUNCTION( numfmt_format )`
`114`	`114`	`}`
`115`	`115`	`RETURN_THROWS();`
`116`	`116`	`default:`
`117`		`- zend_argument_value_error(getThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");`
	`117`	`+ zend_argument_value_error(hasThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");`
`118`	`118`	`RETURN_THROWS();`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ PHP_FUNCTION( numfmt_parse )`
`96`	`96`	`}`
`97`	`97`	`goto cleanup;`
`98`	`98`	`default:`
`99`		`- zend_argument_value_error(getThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");`
	`99`	`+ zend_argument_value_error(hasThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");`
`100`	`100`	`goto cleanup;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static PHP_GINIT_FUNCTION(mysqli);`
`49`	`49`	`} \`
`50`	`50`	`}`
`51`	`51`
`52`		`-#define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))`
	`52`	`+#define ERROR_ARG_POS(arg_num) (hasThis() ? (arg_num-1) : (arg_num))`
`53`	`53`
`54`	`54`	`static HashTable classes;`
`55`	`55`	`static zend_object_handlers mysqli_object_handlers;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include "mysqli_priv.h"`
`32`	`32`	`#include "ext/mysqlnd/mysql_float_to_double.h"`
`33`	`33`
`34`		`-#define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))`
	`34`	`+#define ERROR_ARG_POS(arg_num) (hasThis() ? (arg_num-1) : (arg_num))`
`35`	`35`
`36`	`36`	`/* {{{ Get number of affected rows in previous MySQL operation */`
`37`	`37`	`PHP_FUNCTION(mysqli_affected_rows)`
`@@ -157,7 +157,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)`
`157`	`157`	`RETURN_THROWS();`
`158`	`158`	`}`
`159`	`159`
`160`		`- RETVAL_BOOL(!mysqli_stmt_bind_param_do_bind(stmt, argc, args, types, getThis() ? 1 : 2));`
	`160`	`+ RETVAL_BOOL(!mysqli_stmt_bind_param_do_bind(stmt, argc, args, types, hasThis() ? 1 : 2));`
`161`	`161`	`MYSQLI_REPORT_STMT_ERROR(stmt->stmt);`
`162`	`162`	`}`
`163`	`163`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -1176,7 +1176,7 @@ PHP_FUNCTION(tidy_get_opt_doc)`
`1176`	`1176`	`opt = tidyGetOptionByName(obj->ptdoc->doc, optname);`
`1177`	`1177`
`1178`	`1178`	`if (!opt) {`
`1179`		`- zend_argument_value_error(getThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);`
	`1179`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);`
`1180`	`1180`	`RETURN_THROWS();`
`1181`	`1181`	`}`
`1182`	`1182`
`@@ -1320,7 +1320,7 @@ PHP_FUNCTION(tidy_getopt)`
`1320`	`1320`	`opt = tidyGetOptionByName(obj->ptdoc->doc, optname);`
`1321`	`1321`
`1322`	`1322`	`if (!opt) {`
`1323`		`- zend_argument_value_error(getThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);`
	`1323`	`+ zend_argument_value_error(hasThis() ? 1 : 2, "is an invalid configuration option, \"%s\" given", optname);`
`1324`	`1324`	`RETURN_THROWS();`
`1325`	`1325`	`}`
`1326`	`1326`