Merge pull request #7167 from gilles-peskine-arm/retval-non-empty-2.28

Backport 2.28: Pacify Clang 15 about empty \retval