gcc patch #131051: improvements