Approved by Chris:

$ svn merge -c 113057 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113057 into '.':
A    test/Transforms/LoopSimplify/preserve-scev.ll
U    lib/Transforms/Utils/LoopSimplify.cpp

llvm-svn: 113851