gcc patch #132046: improvements