coverage bug fixes and some refactoring #85215
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
☔ The latest upstream changes (presumably #84278) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r+ rollup |
|
📌 Commit bd3c4b0986110a509ce3cb3db82eed2bf0a662ce has been approved by |
bors
added
S-waiting-on-bors
The coverage body_span doesn't always match the function body_span.
Some code cleanup extracted from future (but unfinished) commit to fix coverage in attr macro functions.
richkadel
force-pushed
the
ice-fixes-minus-dead-blocks
branch
from
bd3c4b0 to
501cd79
Compare
I ran into an error trying to fix dead block coverage and realized the `coverageinfo` query is getting a different MIR compared to the codegenned MIR, which can sometimes be a problem during mapgen. I changed that query to use the `InstandeDef` (which includes the generic parameter substitutions, prosibly specific to const params) instead of the `DefId` (without unknown/default const substitutions).
richkadel
force-pushed
the
ice-fixes-minus-dead-blocks
branch
from
501cd79 to
aed8ef5
Compare
|
@bors r=tmandry |
|
@richkadel: 🔑 Insufficient privileges: Not in reviewers |
|
@bors r+ |
|
📌 Commit aed8ef5 has been approved by |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
May 15, 2021
…ks, r=tmandry coverage bug fixes and some refactoring This replaces the relevant commits (2 and 3) from PR rust-lang#85082, and also corrects an error querying for coverageinfo. 1. `coverageinfo` query needs to use the same MIR as codegen I ran into an error trying to fix dead block coverage and realized the `coverageinfo` query is getting a different MIR compared to the codegenned MIR, which can sometimes be a problem during mapgen. I changed that query to use the `InstandeDef` (which includes the generic parameter substitutions, prosibly specific to const params) instead of the `DefId` (without unknown/default const substitutions). 2. Simplified body_span and filtered span code Some code cleanup extracted from future (but unfinished) commit to fix coverage in attr macro functions. 3. Spanview needs the relevant body_span used for coverage The coverage body_span doesn't always match the function body_span. r? `@tmandry`
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
May 15, 2021
…ks, r=tmandry coverage bug fixes and some refactoring This replaces the relevant commits (2 and 3) from PR rust-lang#85082, and also corrects an error querying for coverageinfo. 1. `coverageinfo` query needs to use the same MIR as codegen I ran into an error trying to fix dead block coverage and realized the `coverageinfo` query is getting a different MIR compared to the codegenned MIR, which can sometimes be a problem during mapgen. I changed that query to use the `InstandeDef` (which includes the generic parameter substitutions, prosibly specific to const params) instead of the `DefId` (without unknown/default const substitutions). 2. Simplified body_span and filtered span code Some code cleanup extracted from future (but unfinished) commit to fix coverage in attr macro functions. 3. Spanview needs the relevant body_span used for coverage The coverage body_span doesn't always match the function body_span. r? ``@tmandry``
This was referenced May 15, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 15, 2021
…laumeGomez Rollup of 12 pull requests Successful merges: - rust-lang#84461 (rustdoc: Remove unnecessary `StripItem` wrapper) - rust-lang#85067 (Minimize amount of fake `DefId`s used in rustdoc) - rust-lang#85207 (Fix typo in comment) - rust-lang#85215 (coverage bug fixes and some refactoring) - rust-lang#85221 (dbg macro: Discuss use in tests, and slightly clarify) - rust-lang#85246 (Miner code formatting) - rust-lang#85253 (swap function order for better read flow) - rust-lang#85256 (Fix display for "implementors" section) - rust-lang#85268 (Use my real name) - rust-lang#85278 (Improve match statements) - rust-lang#85289 (Fix toggle position on mobile) - rust-lang#85323 (Fix eslint errors) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces the relevant commits (2 and 3) from PR #85082, and also corrects an error querying for coverageinfo.
coverageinfoquery needs to use the same MIR as codegenI ran into an error trying to fix dead block coverage and realized the
coverageinfoquery is getting a different MIR compared to thecodegenned MIR, which can sometimes be a problem during mapgen.
I changed that query to use the
InstandeDef(which includes thegeneric parameter substitutions, prosibly specific to const params)
instead of the
DefId(without unknown/default const substitutions).Some code cleanup extracted from future (but unfinished) commit to fix
coverage in attr macro functions.
The coverage body_span doesn't always match the function body_span.
r? @tmandry