gcc patch #131242: improvements