Sync with 4.0 branch

llvm-svn: 44040
2 files changed