Activating latent test case for r193661.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193664 91177308-0d34-0410-b5e6-96231b3b80d8
Minor efficiency refactor related to 193661.  No functional change.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193665 91177308-0d34-0410-b5e6-96231b3b80d8