https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121475 --- Comment #6 from Andrew Benson <abensonca at gcc dot gnu.org> --- Christopher's patch works for me with no regressions. Christopher - your patch is more extensive than mine - I'm assuming there are aspects of this problem that my patch misses?