Cherry-pick more LLVM 9 fixes#22

nikic wants to merge 2 commits intorust-lang:rustc/9.0-2019-07-08rust-lang/llvm-project:rustc/9.0-2019-07-08from

nikic:llvm-9-fixesnikic/llvm-project:llvm-9-fixesCopy head branch name to clipboard