[PATCH] Fix PR64980 and PR61960

[Bernd Edlinger]

Hi,


this patch fixes PR64980 and PR61960 at the same time.

The unreduced test case for PR64230 is also included, because a previous version
of this patch caused this test to fail but the complete test suite passed without any
indication of any problem.

Boot-strapped and regression-tested on X86_64-unknown-linux-gnu.

OK for trunk?


Thanks,
Bernd.


PS: Special thanks to Dominique for his help with testing of this patch.