https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116348
--- Comment #10 from Xi Ruoyao <xry111 at gcc dot gnu.org> --- I've tested the change and it fixes PR116314 case as well. Richard: do you want me to send your change as a patch like before (the PR116142 fix)?
