Please backport fixes 92145 and 94492 to the active branches

[Nikita Kniazev via Gcc]

I am sorry I cannot find the backport policy in GCC. I asked for a backport
on the bug tracker but have not received any answer.
https://gcc.gnu.org/g:37846c42f1f5ac4d9ba190d49c4373673c89c8b5  /
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92145
https://gcc.gnu.org/g:620cd7861e1266991c9c2a82e1e2d5f4d723ec88 /
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94492