This is same as r99772 (which was reverted) with just one meaningful difference where two source lines exchanged their positions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99816 91177308-0d34-0410-b5e6-96231b3b80d8