diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-08-17 18:18:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-17 18:18:19 +0200 |
| commit | ddbbda47ebf2a69008f48b9c5e83b615e0e00545 (patch) | |
| tree | 0b921132e0ed2da427debf73e30a3c3a7d870015 /compiler/rustc_llvm/llvm-wrapper/Linker.cpp | |
| parent | 9c910ae7ee6207d6b190e5543eecdba5b4c15273 (diff) | |
| parent | ed6315b3fef4ebd9aee053d407eb746c3b1d58bf (diff) | |
| download | rust-ddbbda47ebf2a69008f48b9c5e83b615e0e00545.tar.gz rust-ddbbda47ebf2a69008f48b9c5e83b615e0e00545.zip | |
Rollup merge of #129168 - BoxyUwU:mismatched_ty_correct_id, r=compiler-errors
Return correct HirId when finding body owner in diagnostics
Fixes #129145
Fixes #128810
r? ```@compiler-errors```
```rust
fn generic<const N: u32>() {}
trait Collate<const A: u32> {
type Pass;
fn collate(self) -> Self::Pass;
}
impl<const B: u32> Collate<B> for i32 {
type Pass = ();
fn collate(self) -> Self::Pass {
generic::<{ true }>()
//~^ ERROR: mismatched types
}
}
```
When type checking the `{ true }` anon const we would error with a type mismatch. This then results in diagnostics code attempting to check whether its due to a type mismatch with the return type. That logic was implemented by walking up the hir until we reached the body owner, except instead of using the `enclosing_body_owner` function it special cased various hir nodes incorrectly resulting in us walking out of the anon const and stopping at `fn collate` instead.
This then resulted in diagnostics logic inside of the anon consts `ParamEnv` attempting to do trait solving involving the `<i32 as Collate<B>>::Pass` type which ICEs because it is in the wrong environment.
I have rewritten this function to just walk up until it hits the `enclosing_body_owner` and made some other changes since I found this pretty hard to read/understand. Hopefully it's easier to understand now, it also makes it more obvious that this is not implemented in a very principled way and is definitely missing cases :)
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/Linker.cpp')
0 files changed, 0 insertions, 0 deletions
