gcc patch #132049: improvements