Avoid follow-up errors if the number of generic parameters already doesn't match #125608

oli-obk · 2024-05-27T10:01:03Z

best reviewed commit-by-commit

rustbot · 2024-05-27T10:01:12Z

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-05-27T10:01:14Z

HIR ty lowering was modified

cc @fmease

BoxyUwU · 2024-06-01T05:36:22Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs

+                if !trait_ref.self_ty().references_error() {
+                    assert_eq!(trait_ref.self_ty(), dummy_self);
+                }


I am a bit nervous about this change. I feel like the rest of the compiler ought to be able to assume that trait objects are represented "correctly", especially with how we're starting to not end the compilation as early when hitting errors nowadays

Is it possible to make sure we still use the right self ty?

I reverted the change and instead only marked those generic params as errors that were actually erroneous

BoxyUwU

cool

bors · 2024-06-03T10:31:00Z

☔ The latest upstream changes (presumably #125778) made this pull request unmergeable. Please resolve the merge conflicts.

… are unused, just the number of entries is checked. The indices will be used in a follow-up commit

oli-obk · 2024-06-03T13:50:59Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

-                            let args = args.unwrap();
-                            if args.iter().any(|arg| match arg.unpack() {
-                                GenericArgKind::Type(ty) => ty.references_error(),
-                                _ => false,
-                            }) {
+                            if let Some(prev) =
+                                preceding_args.iter().find_map(|arg| match arg.unpack() {
+                                    GenericArgKind::Type(ty) => ty.error_reported().err(),
+                                    _ => None,
+                                })
+                            {
                                // Avoid ICE #86756 when type error recovery goes awry.
-                                return Ty::new_misc_error(tcx).into();
+                                return Ty::new_error(tcx, prev).into();


Fishy ICE workaround, but I rather preserved it for now instead of looking into it

oli-obk · 2024-06-03T13:51:44Z

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

@@ -1275,6 +1275,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

            fn provided_kind(
                &mut self,
+                _preceding_args: &[ty::GenericArg<'tcx>],


Could actually allow generic const generics now here, but there's probably other work required elsewhere to support it properly

Yeah basically nothing is set up for that at all lol

BoxyUwU · 2024-06-03T20:18:19Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs

-                gen_args.args[max_expected_args..provided_args].iter().map(|arg| arg.span()),
-            );
-        };
+        invalid_args.extend(min_expected_args..provided_args);


Will this not give a backwards range (i.e. 2..1) if you have a fn foo<'a: 'a, 'b: 'b> and you call it foo::<'static>?

Yes, but that's the prev behaviour. I just merged the two loops

BoxyUwU · 2024-06-03T20:34:31Z

@bors r+

bors · 2024-06-03T20:34:34Z

📌 Commit d498eb5 has been approved by BoxyUwU

It is now in the queue for this repository.

…, r=BoxyUwU Avoid follow-up errors if the number of generic parameters already doesn't match fixes rust-lang#125604 best reviewed commit-by-commit

Rollup of 9 pull requests Successful merges: - rust-lang#122804 (Item bounds can reference self projections and still be object safe) - rust-lang#124486 (Add tracking issue and unstable book page for `"vectorcall"` ABI) - rust-lang#125504 (Change pedantically incorrect OnceCell/OnceLock wording) - rust-lang#125608 (Avoid follow-up errors if the number of generic parameters already doesn't match) - rust-lang#125690 (ARM Target Docs Update) - rust-lang#125750 (Align `Term` methods with `GenericArg` methods, add `Term::expect_*`) - rust-lang#125818 (Handle no values cfgs with `--print=check-cfg`) - rust-lang#125909 (rustdoc: add a regression test for a former blanket impl synthesis ICE) - rust-lang#125919 (Remove stray "this") r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - rust-lang#124486 (Add tracking issue and unstable book page for `"vectorcall"` ABI) - rust-lang#125504 (Change pedantically incorrect OnceCell/OnceLock wording) - rust-lang#125608 (Avoid follow-up errors if the number of generic parameters already doesn't match) - rust-lang#125690 (ARM Target Docs Update) - rust-lang#125750 (Align `Term` methods with `GenericArg` methods, add `Term::expect_*`) - rust-lang#125818 (Handle no values cfgs with `--print=check-cfg`) - rust-lang#125909 (rustdoc: add a regression test for a former blanket impl synthesis ICE) - rust-lang#125919 (Remove stray "this") r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125608 - oli-obk:subsequent_lifetime_errors, r=BoxyUwU Avoid follow-up errors if the number of generic parameters already doesn't match fixes rust-lang#125604 best reviewed commit-by-commit

matthiaskrgr · 2024-06-05T18:41:13Z

tests/crashes/121134.rs

-//@ known-bug: #121134
-trait Output<'a> {
-    type Type;
-}
-
-struct Wrapper;
-
-impl Wrapper {
-    fn do_something_wrapper<O, F>(&mut self, do_something_wrapper: F)
-    where
-        FnOnce:,
-        F: for<'a> FnOnce(<F as Output<i32, _>>::Type),
-    {
-    }
-}
-
-fn main() {
-    let mut wrapper = Wrapper;
-    wrapper.do_something_wrapper::<i32, _>(|value| ());
-}


this issue is not closed

Add regression test for a gce + effects ICE Fixes rust-lang#125770 I'm not *exactly* sure why this stopped ICEing, I assume its something to do with the fact that there used to be a generic parameter on `Add` for the host generic and we have mismatched args here, which rust-lang#125608 made no longer later cause issues. But now the desugaring is also different so? 🤷‍♀️ r? `@fee1-dead`

Rollup merge of rust-lang#127711 - BoxyUwU:add_effects_test, r=fee1-dead Add regression test for a gce + effects ICE Fixes rust-lang#125770 I'm not *exactly* sure why this stopped ICEing, I assume its something to do with the fact that there used to be a generic parameter on `Add` for the host generic and we have mismatched args here, which rust-lang#125608 made no longer later cause issues. But now the desugaring is also different so? 🤷‍♀️ r? `@fee1-dead`

rustbot assigned BoxyUwU May 27, 2024

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 May 27, 2024

This comment has been minimized.

Sign in to view

BoxyUwU reviewed Jun 1, 2024

View reviewed changes

oli-obk added 6 commits June 3, 2024 13:03

Add regression test

aebe8a7

Hide some follow-up errors

61c4b7f

Avoid an Option that is always Some

4dec6bb

Store indices of generic args instead of spans, as the actual entries…

24af952

… are unused, just the number of entries is checked. The indices will be used in a follow-up commit

Mark all missing generic args as errors

2e3842b

Mark all extraneous generic args as errors

adb2ac0

oli-obk force-pushed the subsequent_lifetime_errors branch from 374cfb1 to adb2ac0 Compare June 3, 2024 13:21

oli-obk added 3 commits June 3, 2024 13:28

Explain some code duplication

063b26a

Always provide previous generic arguments

108a1e5

Provide previous generic arguments to provided_kind

d498eb5

oli-obk commented Jun 3, 2024

View reviewed changes

BoxyUwU reviewed Jun 3, 2024

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 Jun 3, 2024

Noratrieb mentioned this pull request Jun 4, 2024

Rollup of 9 pull requests #125956

Closed

jieyouxu mentioned this pull request Jun 4, 2024

Rollup of 8 pull requests #125960

Merged

bors merged commit 0dc6550 into rust-lang:master Jun 4, 2024
6 checks passed

rustbot added this to the 1.80.0 milestone Jun 4, 2024

oli-obk deleted the subsequent_lifetime_errors branch June 4, 2024 13:10

matthiaskrgr reviewed Jun 5, 2024

View reviewed changes

matthiaskrgr mentioned this pull request Jun 8, 2024

ICE: relating different kinds #121134

Closed

GrigorenkoPV mentioned this pull request Jul 2, 2024

ICE; tried to combine ConstKind::Infer/ConstKind::Infer(InferConst::Var): ?0e: bool and ?0c: Dimension #125770

Closed

BoxyUwU mentioned this pull request Jul 14, 2024

Add regression test for a gce + effects ICE #127711

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid follow-up errors if the number of generic parameters already doesn't match #125608

Avoid follow-up errors if the number of generic parameters already doesn't match #125608

oli-obk commented May 27, 2024 •

edited

Loading

rustbot commented May 27, 2024

rustbot commented May 27, 2024

This comment has been minimized.

BoxyUwU Jun 1, 2024 •

edited

Loading

oli-obk Jun 3, 2024

BoxyUwU left a comment

bors commented Jun 3, 2024

oli-obk Jun 3, 2024

oli-obk Jun 3, 2024

BoxyUwU Jun 3, 2024

BoxyUwU Jun 3, 2024

oli-obk Jun 3, 2024

BoxyUwU commented Jun 3, 2024

bors commented Jun 3, 2024

matthiaskrgr Jun 5, 2024

Avoid follow-up errors if the number of generic parameters already doesn't match #125608

Avoid follow-up errors if the number of generic parameters already doesn't match #125608

Conversation

oli-obk commented May 27, 2024 • edited Loading

rustbot commented May 27, 2024

rustbot commented May 27, 2024

This comment has been minimized.

BoxyUwU Jun 1, 2024 • edited Loading

Choose a reason for hiding this comment

oli-obk Jun 3, 2024

Choose a reason for hiding this comment

BoxyUwU left a comment

Choose a reason for hiding this comment

bors commented Jun 3, 2024

oli-obk Jun 3, 2024

Choose a reason for hiding this comment

oli-obk Jun 3, 2024

Choose a reason for hiding this comment

BoxyUwU Jun 3, 2024

Choose a reason for hiding this comment

BoxyUwU Jun 3, 2024

Choose a reason for hiding this comment

oli-obk Jun 3, 2024

Choose a reason for hiding this comment

BoxyUwU commented Jun 3, 2024

bors commented Jun 3, 2024

matthiaskrgr Jun 5, 2024

Choose a reason for hiding this comment

oli-obk commented May 27, 2024 •

edited

Loading

BoxyUwU Jun 1, 2024 •

edited

Loading