With some minor manual fixes for using function_ref instead of std::function. No functional change intended. llvm-svn: 291904