Fix the build after r185363. Use llvm::next instead of raw next.
Fix the test which relies on uncommitted change