I’ve filed a bug upstream(GDB) to track it:
https://sourceware.org/bugzilla/show_bug.cgi?id=33926

The discussion is ongoing there, and a fix is already being worked on for mainline.
I’ll follow up here once we have either an upstream patch or a suitable backport for 17.1.

Thanks,
Sunil