Apply changes to sync with llvm upstream.
5 files changed