Fix ret > 1 bound if shadowed by const #93593

JulianKnodt · 2022-02-02T16:45:10Z

Prior to a change, it would only look at types in bounds. When it started looking for consts,
shadowing type variables with a const would cause an ICE, so now defer looking at consts only if
there are no types present.

cc @compiler-errors
Should Fix #93553

rust-highfive · 2022-02-02T16:45:13Z

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

JulianKnodt · 2022-02-02T16:46:03Z

compiler/rustc_typeck/src/astconv/mod.rs

+            .filter(|r| self.trait_defines_associated_type_named(r.def_id(), assoc_name));
+        let mut const_candidates = all_candidates()
+            .filter(|r| self.trait_defines_associated_const_named(r.def_id(), assoc_name));
+


This is the main fix, the rest should make it more carefully stick to logic prior associated-const equality change which introduced the ice.

compiler-errors · 2022-02-02T21:42:35Z

Can you verify that the compiler doesn't ICE in situations like:

trait Baz {
  const Bar: usize;
  const Qux: Self::Bar;
}

JulianKnodt · 2022-02-03T01:45:32Z

I don't think it should ice in that case since there's no shadowing and no name overlaps, but will add a test in

JulianKnodt · 2022-02-03T03:45:56Z

oh it does ice, I'll look into it a bit further

compiler-errors · 2022-02-03T03:48:41Z

I think the stack trace points to an .expect so you can find where it ICEs. I think it's in a method that resolves a path to a ty, maybe you want to check if it resolves to a const instead and emit an error. Maybe something like this:

trait Baz {
  const Bar: usize;
  const Qux: Self::Bar;
//           ^ Expected type, found const
}

JulianKnodt · 2022-02-03T04:09:52Z

yuh, i'm not sure if the best way to fix it is to turn the expect into an actual error, or handle it earlier, for now I can just turn it into an error and if the reviewer wants to do the other I'll update

compiler/rustc_typeck/src/astconv/mod.rs

oli-obk · 2022-02-03T14:43:37Z

r? @oli-obk

Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present.

oli-obk · 2022-02-03T15:44:23Z

@bors r+

bors · 2022-02-03T15:44:25Z

📌 Commit 2dfd77d has been approved by oli-obk

Fix ret > 1 bound if shadowed by const Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present. cc `@compiler-errors` Should Fix rust-lang#93553

Fix ret > 1 bound if shadowed by const Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present. cc ``@compiler-errors`` Should Fix rust-lang#93553

Fix ret > 1 bound if shadowed by const Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present. cc ```@compiler-errors``` Should Fix rust-lang#93553

Fix ret > 1 bound if shadowed by const Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present. cc ````@compiler-errors```` Should Fix rust-lang#93553

Fix ret > 1 bound if shadowed by const Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present. cc `````@compiler-errors````` Should Fix rust-lang#93553

…askrgr Rollup of 11 pull requests Successful merges: - rust-lang#92735 (Add crate filter parameter in URL) - rust-lang#93402 (Windows: Disable LLVM crash dialog boxes.) - rust-lang#93508 (Add rustdoc info to jsondocck output) - rust-lang#93551 (Add package.json in gitignore) - rust-lang#93555 (Link `try_exists` docs to `Path::exists`) - rust-lang#93585 (Missing tests for rust-lang#92630) - rust-lang#93593 (Fix ret > 1 bound if shadowed by const) - rust-lang#93630 (clippy::perf fixes) - rust-lang#93631 (rustc_mir_dataflow: use iter::once instead of Some().into_iter) - rust-lang#93632 (rustdoc: clippy::complexity fixes) - rust-lang#93638 (rustdoc: remove unused Hash impl) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned matthewjasper Feb 2, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 2, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 2, 2022

JulianKnodt force-pushed the master branch from ca2424c to 94b7846 Compare February 2, 2022 16:46

JulianKnodt commented Feb 2, 2022

View reviewed changes

JulianKnodt force-pushed the master branch from 94b7846 to 3f8dd59 Compare February 3, 2022 04:55

oli-obk requested changes Feb 3, 2022

View reviewed changes

rust-highfive assigned oli-obk and unassigned matthewjasper Feb 3, 2022

JulianKnodt force-pushed the master branch 2 times, most recently from fbdfc36 to 1813d8e Compare February 3, 2022 15:14

Fix ret > 1 bound if shadowed by const

2dfd77d

Prior to a change, it would only look at types in bounds. When it started looking for consts, shadowing type variables with a const would cause an ICE, so now defer looking at consts only if there are no types present.

JulianKnodt force-pushed the master branch from 1813d8e to 2dfd77d Compare February 3, 2022 15:17

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 Feb 3, 2022

matthiaskrgr mentioned this pull request Feb 3, 2022

Rollup of 5 pull requests #93625

Closed

matthiaskrgr mentioned this pull request Feb 3, 2022

Rollup of 4 pull requests #93627

Closed

matthiaskrgr mentioned this pull request Feb 3, 2022

Rollup of 4 pull requests #93636

Closed

matthiaskrgr mentioned this pull request Feb 4, 2022

Rollup of 7 pull requests #93641

Closed

matthiaskrgr mentioned this pull request Feb 4, 2022

Rollup of 6 pull requests #93642

Closed

matthiaskrgr mentioned this pull request Feb 4, 2022

Rollup of 11 pull requests #93645

Merged

bors merged commit 92a7f5f into rust-lang:master Feb 4, 2022

rustbot added this to the 1.60.0 milestone Feb 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ret > 1 bound if shadowed by const #93593

Fix ret > 1 bound if shadowed by const #93593

JulianKnodt commented Feb 2, 2022

rust-highfive commented Feb 2, 2022

JulianKnodt Feb 2, 2022 •

edited

Loading

compiler-errors commented Feb 2, 2022

JulianKnodt commented Feb 3, 2022

JulianKnodt commented Feb 3, 2022

compiler-errors commented Feb 3, 2022

JulianKnodt commented Feb 3, 2022 •

edited

Loading

oli-obk commented Feb 3, 2022

oli-obk commented Feb 3, 2022

bors commented Feb 3, 2022

Fix ret > 1 bound if shadowed by const #93593

Fix ret > 1 bound if shadowed by const #93593

Conversation

JulianKnodt commented Feb 2, 2022

rust-highfive commented Feb 2, 2022

JulianKnodt Feb 2, 2022 • edited Loading

Choose a reason for hiding this comment

compiler-errors commented Feb 2, 2022

JulianKnodt commented Feb 3, 2022

JulianKnodt commented Feb 3, 2022

compiler-errors commented Feb 3, 2022

JulianKnodt commented Feb 3, 2022 • edited Loading

oli-obk commented Feb 3, 2022

oli-obk commented Feb 3, 2022

bors commented Feb 3, 2022

JulianKnodt Feb 2, 2022 •

edited

Loading

JulianKnodt commented Feb 3, 2022 •

edited

Loading