Being conservative I'd go for my patch on 4.0 and yours (if verified) on mainline.
I'm fine with that. Have you actually written a patch yet? I don't see one in the bug report or in gcc-patches.
I found a complication with my patch (string constants) when bootstrapping, and I plan to fix it by reorganizing the code a bit, so my patch will definitately not be a good idea for the 4.0 branch when I am done.
--
Jim Wilson, GNU Tools Support, http://www.SpecifixInc.com
