Skip to content

coverage: Clean up a few things after the counters overhaul #135680

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

Merged
merged 5 commits into from
Jan 19, 2025
Merged

coverage: Clean up a few things after the counters overhaul #135680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a14c35c
coverage: Remove the `Site` enum now that we only instrument nodes
Zalathar Jan 17, 2025
4839944
coverage: Move `phys_counter_for_node` into `CoverageCounters`
Zalathar Jan 17, 2025
4170b93
coverage: Flatten top-level counter creation into plain functions
Zalathar Jan 17, 2025
6000d5c
coverage: Remove `BcbCounter` and `BcbExpression`
Zalathar Jan 17, 2025
ea0c86c
coverage: Add a few more comments to counter creation
Zalathar Jan 18, 2025
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
8 changes: 2 additions & 6 deletions compiler/rustc_middle/src/mir/coverage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ impl ConditionId {

/// Enum that can hold a constant zero value, the ID of an physical coverage
/// counter, or the ID of a coverage-counter expression.
///
/// This was originally only used for expression operands (and named `Operand`),
/// but the zero/counter/expression distinction is also useful for representing
/// the value of code/gap mappings, and the true/false arms of branch mappings.
#[derive(Copy, Clone, PartialEq, Eq)]
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
#[derive(TyEncodable, TyDecodable, Hash, HashStable, TypeFoldable, TypeVisitable)]
pub enum CovTerm {
Zero,
Expand Down Expand Up @@ -171,7 +167,7 @@ impl Op {
}
}

#[derive(Clone, Debug)]
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(TyEncodable, TyDecodable, Hash, HashStable, TypeFoldable, TypeVisitable)]
pub struct Expression {
pub lhs: CovTerm,
Expand Down
Loading
Loading