gcc patch #131363: improvements