gcc patch #131852: improvements