gcc patch #131063: improvements