I have now backported https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89505 just in case and will update devel:gcc with it.