https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88547
--- Comment #6 from Jakub Jelinek <jakub at gcc dot gnu.org> --- Created attachment 45274 --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=45274&action=edit gcc9-pr88547.patch Untested patch for the rest. Richard, is that what you had in mind?