Not quite comfortable poking around in the compiler, but find a patch attached.

I also found this related bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32644.