gcc patch #131772: improvements