Attempt to fix breakage from r128782 reported by Francois Pichet on

llvm-commits.  (Not sure why it only breaks on Windows; maybe it has
something to do with the iterator representation...)

llvm-svn: 128802