Revert r72575, which isn't really right, and fix up other code to 
handle the construct in question correctly.



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