Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades the coverage map to Version 4 #79365

Merged
merged 8 commits into from
Nov 26, 2020
Merged

Upgrades the coverage map to Version 4 #79365

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d8c381
Upgrades the coverage map to Version 4
richkadel Nov 23, 2020
5d5dc4c
Updated links to LLVM 11 docs and types
richkadel Nov 24, 2020
51268d2
Check for LLVM 11+ when using `-Z instrument-coverage`
richkadel Nov 24, 2020
b5fef37
Apply suggestions from code review
richkadel Nov 25, 2020
b4668ec
Improved version check
richkadel Nov 25, 2020
b1df6c0
replace assert with condition and `fatal` error
richkadel Nov 25, 2020
d334f58
Update compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
richkadel Nov 25, 2020
fdbc121
fix URLs in doc comment
richkadel Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ pub fn finalize<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>) {
// Ensure LLVM supports Coverage Map Version 4 (encoded as a zero-based value: 3).
// If not, the LLVM Version must be less than 11.
let version = coverageinfo::mapping_version();
assert_eq!(version, 3, "rustc option `-Z instrument-coverage` requires LLVM 11 or higher.");
if version != 3 {
cx.tcx.sess.fatal("rustc option `-Z instrument-coverage` requires LLVM 11 or higher.");
}```

let function_coverage_map = match cx.coverage_context() {
Some(ctx) => ctx.take_function_coverage_map(),
Expand Down