merge of use-diet branch to trunk

llvm-svn: 50943
GitOrigin-RevId: f6caff66a1bfa6464e6a17c0bcfcf06a09a9b909
18 files changed