tree b7fcea408329d33e2277a32b6097bb31322dc37c
parent c5be7b0fc804d8e6f87298ec03c94d8cccd74f29
author Douglas Gregor <dgregor@apple.com> 1285707054 +0000
committer Douglas Gregor <dgregor@apple.com> 1285707054 +0000

Reinstate r114925 and r114929, both steps toward
<rdar://problem/8459981>.


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