Re-commit r255115, with the PredicatedScalarEvolution class moved to