Pull in fixes from upstream LLVM.