Skip to content

Rollup of 3 pull requests - #162005

Closed
JonathanBrouwer wants to merge 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-HTFAHQ8
Closed

Rollup of 3 pull requests#162005
JonathanBrouwer wants to merge 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-HTFAHQ8

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

malezjaa and others added 6 commits August 29, 2026 15:32
- CoverageInfoHi       => CoverageEarlyInfo
- FunctionCoverageInfo => CoverageMirInfo
- CoverageIdsInfo      => CoverageCodegenInfo
coverage: Rename the three main coverage-info structs

This PR renames the three main structures used to carry per-function coverage info through different stages of compilation:
```text
- CoverageInfoHi       => CoverageEarlyInfo   // collected early, at the THIR/MIR boundary during MIR building
- FunctionCoverageInfo => CoverageMirInfo     // collected during the main MIR instrumentation pass
- CoverageIdsInfo      => CoverageCodegenInfo // collected during codegen, after MIR opts
```

The new names should hopefully help to keep the three structs distinct, while also avoiding the historical inconsistency of the previous names.

The renaming also resolves an old TODO of mine about `coverage_ids_info` no longer making sense as a name.

There should be no change to compiler behaviour.
Rerun `tests/debuginfo` tests if repr data has changed

Resolves rust-lang#161138

This also includes the necessary checking for GDB's data even though none exists atm (rust-lang#160377 will contain the first set). The extra handling doesn't hurt anything since we have to account for all the other tests that don't have repr data anyway.

In a followup, I can rename the `lldb_input` directory to something else (see: rust-lang#160137 (comment)). Doing so requires me to touch a bunch of other places where the name is used, so it should probably be it's own PR. Making sure the tests rerun when the data changes is higher priority though atm.

r? @jieyouxu , @Kobzol

cc @Mark-Simulacrum
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 30, 2026
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 30, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 265d8ee has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 30, 2026
@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 30, 2026
@rust-bors

rust-bors Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.

5 participants