Be more careful about choosing restore points when doing restore folding.  This fixes some subtle miscompilations.

llvm-svn: 66147