Backport coverage fixes#108

Nashenas88 wants to merge 3 commits intorust-lang:rustc/12.0-2021-04-15rust-lang/llvm-project:rustc/12.0-2021-04-15from

Nashenas88:rustc/12.0-2021-04-15Nashenas88/llvm-project:rustc/12.0-2021-04-15Copy head branch name to clipboard