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.

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

coverage: Rename mir::coverage::BranchInfo to CoverageInfoHi #127352

Merged
merged 2 commits into from
Jul 5, 2024

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Jul 5, 2024

This opens the door to collecting and storing coverage information that is unrelated to branch coverage or MC/DC, during MIR building.

There is no change to the output of coverage instrumentation, but one deliberate change is that functions now always have an attached CoverageInfoHi (if coverage is enabled and they are eligible), even if they didn't collect any interesting branch information.


@rustbot label +A-code-coverage

@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2024

Some changes occurred in match lowering

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@rustbot rustbot added the A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) label Jul 5, 2024
@Zalathar
Copy link
Contributor Author

Zalathar commented Jul 5, 2024

Originally I was also planning to rename FunctionCoverageInfo to CoverageInfoMid, but when I actually tried that, I found that it made things more confusing, because the consistent names are too similar to each other.

So the slightly-inconsistent names make it easier to get a mental foothold on which is which, especially since they are used in places that mostly don't overlap.

@rust-log-analyzer

This comment has been minimized.

Zalathar added 2 commits July 5, 2024 13:53
This opens the door to collecting and storing coverage information that is
unrelated to branch coverage or MC/DC.
@oli-obk
Copy link
Contributor

oli-obk commented Jul 5, 2024

r? @oli-obk

bors r plus

@bors rollup

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit f96f443 has been approved by oli-obk

It is now in the queue for this repository.

@rustbot rustbot assigned oli-obk and unassigned wesleywiser Jul 5, 2024
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
…llaumeGomez

Rollup of 7 pull requests

Successful merges:

 - rust-lang#124290 (DependencyList: removed outdated comment)
 - rust-lang#126709 (Migrate `include_bytes_deps`, `optimization-remarks-dir-pgo`, `optimization-remarks-dir`, `issue-40535` and `rmeta-preferred` `run-make` tests to rmake)
 - rust-lang#127214 (Use the native unwind function in miri where possible)
 - rust-lang#127320 (Update windows-bindgen to 0.58.0)
 - rust-lang#127349 (Tweak `-1 as usize` suggestion)
 - rust-lang#127352 (coverage: Rename `mir::coverage::BranchInfo` to `CoverageInfoHi`)
 - rust-lang#127359 (Improve run make llvm ident code)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e4d7f7c into rust-lang:master Jul 5, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
Rollup merge of rust-lang#127352 - Zalathar:coverage-info, r=oli-obk

coverage: Rename `mir::coverage::BranchInfo` to `CoverageInfoHi`

This opens the door to collecting and storing coverage information that is unrelated to branch coverage or MC/DC, during MIR building.

There is no change to the output of coverage instrumentation, but one deliberate change is that functions now *always* have an attached `CoverageInfoHi` (if coverage is enabled and they are eligible), even if they didn't collect any interesting branch information.

---

`@rustbot` label +A-code-coverage
@Zalathar Zalathar deleted the coverage-info branch July 5, 2024 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants