gcc patch #131291: improvements