Recommit: "[FIX] Determine insertion point during SCEV expansion"

This patch was originally contributed by Johannes Doerfert in r271892, but
was in conflict with the revert in r272483.

llvm-svn: 272486