Fix an iterator-invalidation bug that was causing selfhost errors

on non-darwin platforms.  Fixes PR6411. Test case doesn't reduce,
unfortunately.

llvm-svn: 97055