I'd like to eventually rip it out, but for now producing the
same selections as the old matcher is more important.

llvm-svn: 96458