Merge r100559 from mainline to fix PR6696.

llvm-svn: 100851
5 files changed
tree: 4616dc1bc002b4fdb34156279fb1b26de30c19c8
  1. clang/
  2. llvm/