Allow for a missing adt_def in NamePrivacyVisitor.
#121482
Merged
Conversation
This file contains 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
This was caused by 72b172b in rust-lang#121206. That commit removed an early return from `analysis` when there are stashed errors. As a result, it's possible to reach privacy analysis when there are stashed errors, which means more code paths can be reached. One such code path was handled in that commit, where a `span_bug` was changed to a `span_delayed_bug`. This commit handles another such code path uncovered by fuzzing, in much the same way. Fixes rust-lang#121455.
rustbot
added
S-waiting-on-review
oli-obk
reviewed
Feb 23, 2024
| @@ -988,7 +988,10 @@ impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> { | |||
| fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) { | |||
| if let hir::ExprKind::Struct(qpath, fields, ref base) = expr.kind { | |||
There was a problem hiding this comment.
how do we ge an exprkind struct in the example you gave?
There was a problem hiding this comment.
The range somehow becomes a struct. Here's partial output with -Zunpretty=hir-tree:
Expr {
hir_id: HirId(DefId(0:3 ~ unreachable_issue_121455[470e]::test).8),
kind: Struct(
LangItem(
Range,
tests/ui/privacy/unreachable-issue-121455.rs:3:14: 3:18 (#0),
),
[
ExprField {
...
},
ExprField {
...
},
],
None,
),
span: tests/ui/privacy/unreachable-issue-121455.rs:3:14: 3:18 (#0),
},
oli-obk
reviewed
Feb 23, 2024
| @@ -988,7 +988,10 @@ impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> { | |||
| fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) { | |||
| if let hir::ExprKind::Struct(qpath, fields, ref base) = expr.kind { | |||
| let res = self.typeck_results().qpath_res(qpath, expr.hir_id); | |||
| let adt = self.typeck_results().expr_ty(expr).ty_adt_def().unwrap(); | |||
| let Some(adt) = self.typeck_results().expr_ty(expr).ty_adt_def() else { | |||
There was a problem hiding this comment.
is this error case only reachable for ty::Error? If so, I'm wondering if we should return Resut<Option<AdtDef>, ErrorGuaranteed>. The churn may be useless, or it exposes more such cases
There was a problem hiding this comment.
I checked, and yes, the result of self.typeck_results().expr_ty(expr) is ty::Error. I don't know if that's the only thing that can reach here; it's the only thing we've seen reach here because this is the first time the the adt_def has ever failed.
There was a problem hiding this comment.
As for ty_adt_def's return type... it has ~100 call sites. I looked through some of them, I don't see any patterns where having an ErrorGuaranteed would be useful. There were a couple of places where a normal error (not a span_delayed_bug) was emitted in the case where it returned None.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 23, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121434 (Fix rust-lang#121208 fallout) - rust-lang#121471 (When encountering `<&T as Clone>::clone(x)` because `T: Clone`, suggest `#[derive(Clone)]`) - rust-lang#121476 (remove `llvm.assertions=true` in compiler profile) - rust-lang#121479 (fix generalizer unsoundness) - rust-lang#121480 (Fix more rust-lang#121208 fallout) - rust-lang#121482 (Allow for a missing `adt_def` in `NamePrivacyVisitor`.) - rust-lang#121484 (coverage: Use variable name `this` in `CoverageGraph::from_mir`) - rust-lang#121487 (Explicitly call `emit_stashed_diagnostics`.) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 23, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121434 (Fix rust-lang#121208 fallout) - rust-lang#121471 (When encountering `<&T as Clone>::clone(x)` because `T: Clone`, suggest `#[derive(Clone)]`) - rust-lang#121476 (remove `llvm.assertions=true` in compiler profile) - rust-lang#121479 (fix generalizer unsoundness) - rust-lang#121480 (Fix more rust-lang#121208 fallout) - rust-lang#121482 (Allow for a missing `adt_def` in `NamePrivacyVisitor`.) - rust-lang#121484 (coverage: Use variable name `this` in `CoverageGraph::from_mir`) - rust-lang#121487 (Explicitly call `emit_stashed_diagnostics`.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 23, 2024
Rollup merge of rust-lang#121482 - nnethercote:fix-121455, r=oli-obk Allow for a missing `adt_def` in `NamePrivacyVisitor`. This was caused by 72b172b in rust-lang#121206. That commit removed an early return from `analysis` when there are stashed errors. As a result, it's possible to reach privacy analysis when there are stashed errors, which means more code paths can be reached. One such code path was handled in that commit, where a `span_bug` was changed to a `span_delayed_bug`. This commit handles another such code path uncovered by fuzzing, in much the same way. Fixes rust-lang#121455. r? `@oli-obk`
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Feb 27, 2024
This undoes the changes from rust-lang#121482 and rust-lang#121586, now that stashed errors will trigger more early aborts.
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Feb 27, 2024
This undoes the changes from rust-lang#121482 and rust-lang#121586, now that stashed errors will trigger more early aborts.
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Feb 27, 2024
This undoes the changes from rust-lang#121482 and rust-lang#121586, now that stashed errors will trigger more early aborts.
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Feb 29, 2024
This undoes the changes from rust-lang#121482 and rust-lang#121586, now that stashed errors will trigger more early aborts.
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Mar 1, 2024
This undoes the changes from rust-lang#121482 and rust-lang#121586, now that stashed errors will trigger more early aborts.
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 was caused by 72b172b in #121206. That commit removed an early return from
analysiswhen there are stashed errors. As a result, it's possible to reach privacy analysis when there are stashed errors, which means more code paths can be reached. One such code path was handled in that commit, where aspan_bugwas changed to aspan_delayed_bug.This commit handles another such code path uncovered by fuzzing, in much the same way.
Fixes #121455.
r? @oli-obk