Merge from mainline for PR1693.

llvm-svn: 42201
1 file changed
tree: 112c1898927520db126d23a284c533f1e7eb0dbe
  1. llvm/