gcc patch #131092: improvements