Merging from mainline

llvm-svn: 31872
2 files changed
tree: 107e7f805b31da8933fc80936a84f36860aa92f0
  1. llvm/