gcc patch #131042: improvements