Introduce `-C instrument-coverage=branch` to gate branch coverage #116094

Swatinem · 2023-09-23T06:42:08Z

This was extracted from #115061 and can land independently from other coverage related work.

The flag is unused for now, but is added in advance of adding branch coverage support.
It is an unstable, nightly only flag that needs to be used in combination with -Zunstable-options, like so: -Zunstable-options -C instrument-coverage=branch.

The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

rustbot · 2023-09-23T06:42:15Z

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

Zalathar · 2023-09-23T07:35:05Z

@rustbot label +A-code-coverage

One thing I want to note (and possibly you already agree with) is that I think we should operate under the assumption that this flag value will never become stable.

Instead, we should work on branch coverage (behind this flag if necessary) until it's polished enough to become the default behaviour, and then enable that behaviour by default.

(It's hypothetically possible that stable users might have some legitimate reason to want to turn off branch coverage, but we can worry about that case if and when it arises.)

Zalathar · 2023-09-23T07:37:25Z

Another pre-existing issue I noticed is that even though the non-stable values of -C instrument-coverage= can't be set on stable compilers, they still appear in the help text on stable compilers, which I believe is not supposed to happen.

Swatinem · 2023-09-23T07:59:19Z

Yes exactly, the flag should only exist until all the kinks of branch coverage are ironed out and it can be turned on by default.

compiler/rustc_session/src/config.rs

compiler/rustc_session/src/options.rs

wesleywiser · 2023-10-19T13:54:04Z

@Swatinem could you mention in the PR description that this flag is being added unstably? At first glance, I thought we were adding this and stabilizing it in one go. 🙂

Swatinem · 2023-10-21T09:15:29Z

👍🏻 Updated the PR description and addressed the review comments.

wesleywiser · 2023-10-23T14:31:19Z

@bors r+ rollup

bors · 2023-10-23T14:31:21Z

📌 Commit a5c017c has been approved by wesleywiser

It is now in the queue for this repository.

…esleywiser Introduce `-C instrument-coverage=branch` to gate branch coverage This was extracted from rust-lang#115061 and can land independently from other coverage related work. The flag is unused for now, but is added in advance of adding branch coverage support. It is an unstable, nightly only flag that needs to be used in combination with `-Zunstable-options`, like so: `-Zunstable-options -C instrument-coverage=branch`. The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

matthiaskrgr · 2023-10-23T18:24:04Z

may need rebase, failed in #117096
@bors rollup=iffy
(feel free to remove after rebase or whatever ^^)

Zalathar · 2023-10-23T20:49:18Z

Yeah, this needs to be rebased and re-blessed because it touches error messages that are now tested by #117040. Sorry for the inconvenience.

bors · 2023-10-24T00:13:58Z

⌛ Testing commit a5c017c with merge 84c29ec...

…leywiser Introduce `-C instrument-coverage=branch` to gate branch coverage This was extracted from rust-lang#115061 and can land independently from other coverage related work. The flag is unused for now, but is added in advance of adding branch coverage support. It is an unstable, nightly only flag that needs to be used in combination with `-Zunstable-options`, like so: `-Zunstable-options -C instrument-coverage=branch`. The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

bors · 2023-10-24T00:24:25Z

💔 Test failed - checks-actions

This flag has to be used in combination with `-Zunstable-options`, and is added in advance of adding branch coverage instrumentation.

Swatinem · 2023-10-24T07:52:31Z

Rebased and blessed the tests. Hope I didn’t miss anything.

wesleywiser · 2023-10-24T13:59:29Z

@bors r+ rollup

bors · 2023-10-24T13:59:31Z

📌 Commit 2b36547 has been approved by wesleywiser

It is now in the queue for this repository.

…esleywiser Introduce `-C instrument-coverage=branch` to gate branch coverage This was extracted from rust-lang#115061 and can land independently from other coverage related work. The flag is unused for now, but is added in advance of adding branch coverage support. It is an unstable, nightly only flag that needs to be used in combination with `-Zunstable-options`, like so: `-Zunstable-options -C instrument-coverage=branch`. The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116714 (Derive `Ord`, `PartialOrd` and `Hash` for `SocketAddr*`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116841 (Suggest unwrap/expect for let binding type mismatch) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117127 (Remove `#[allow(incomplete_features)]` from RPITIT/AFIT tests) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116094 - Swatinem:coverage-branch-gate, r=wesleywiser Introduce `-C instrument-coverage=branch` to gate branch coverage This was extracted from rust-lang#115061 and can land independently from other coverage related work. The flag is unused for now, but is added in advance of adding branch coverage support. It is an unstable, nightly only flag that needs to be used in combination with `-Zunstable-options`, like so: `-Zunstable-options -C instrument-coverage=branch`. The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

rustbot assigned wesleywiser Sep 23, 2023

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 Sep 23, 2023

rustbot added the A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) label Sep 23, 2023

wesleywiser reviewed Oct 19, 2023

View reviewed changes

compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved

compiler/rustc_session/src/options.rs Show resolved Hide resolved

Swatinem force-pushed the coverage-branch-gate branch from 3c6f28a to a5c017c Compare October 21, 2023 09:15

Zalathar mentioned this pull request Oct 22, 2023

coverage: Add UI tests for values accepted by -Cinstrument-coverage #117040

Merged

wesleywiser approved these changes Oct 23, 2023

View reviewed changes

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 Oct 23, 2023

matthiaskrgr mentioned this pull request Oct 23, 2023

Rollup of 7 pull requests #117096

Closed

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2023

This comment has been minimized.

Sign in to view

Zalathar mentioned this pull request Oct 24, 2023

Remove support for alias -Z instrument-coverage #117111

Merged

Introduce -C instrument-coverage=branch to gate branch coverage

2b36547

This flag has to be used in combination with `-Zunstable-options`, and is added in advance of adding branch coverage instrumentation.

Swatinem force-pushed the coverage-branch-gate branch from a5c017c to 2b36547 Compare October 24, 2023 07:51

wesleywiser approved these changes Oct 24, 2023

View reviewed changes

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 Oct 24, 2023

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 6 pull requests #117125

Closed

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 8 pull requests #117135

Merged

bors merged commit c07ff9c into rust-lang:master Oct 24, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Swatinem deleted the coverage-branch-gate branch January 6, 2024 07:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Introduce `-C instrument-coverage=branch` to gate branch coverage #116094

Introduce `-C instrument-coverage=branch` to gate branch coverage #116094

Swatinem commented Sep 23, 2023 •

edited

Loading

rustbot commented Sep 23, 2023

Zalathar commented Sep 23, 2023

Zalathar commented Sep 23, 2023

Swatinem commented Sep 23, 2023

wesleywiser commented Oct 19, 2023

Swatinem commented Oct 21, 2023

wesleywiser commented Oct 23, 2023

bors commented Oct 23, 2023

matthiaskrgr commented Oct 23, 2023

Zalathar commented Oct 23, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

This comment has been minimized.

Swatinem commented Oct 24, 2023

wesleywiser commented Oct 24, 2023

bors commented Oct 24, 2023

Introduce -C instrument-coverage=branch to gate branch coverage #116094

Introduce -C instrument-coverage=branch to gate branch coverage #116094

Conversation

Swatinem commented Sep 23, 2023 • edited Loading

rustbot commented Sep 23, 2023

Zalathar commented Sep 23, 2023

Zalathar commented Sep 23, 2023

Swatinem commented Sep 23, 2023

wesleywiser commented Oct 19, 2023

Swatinem commented Oct 21, 2023

wesleywiser commented Oct 23, 2023

bors commented Oct 23, 2023

matthiaskrgr commented Oct 23, 2023

Zalathar commented Oct 23, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

This comment has been minimized.

Swatinem commented Oct 24, 2023

wesleywiser commented Oct 24, 2023

bors commented Oct 24, 2023

Introduce `-C instrument-coverage=branch` to gate branch coverage #116094

Introduce `-C instrument-coverage=branch` to gate branch coverage #116094

Swatinem commented Sep 23, 2023 •

edited

Loading