gcc patch #131871: improvements