From a9c2378b7dc365189178130d3d3b701aec3809aa Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Sat, 21 Mar 2020 13:22:26 +0100
Subject: [PATCH] fix type of const params in associated types.

---
 src/librustc_typeck/collect/type_of.rs        | 20 +++++++++++++++----
 .../ui/const-generics/issues/issue-66906.rs   | 12 +++++++++++
 .../const-generics/issues/issue-66906.stderr  |  8 ++++++++
 .../ui/const-generics/issues/issue-70167.rs   | 10 ++++++++++
 .../const-generics/issues/issue-70167.stderr  |  8 ++++++++
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/test/ui/const-generics/issues/issue-66906.rs
 create mode 100644 src/test/ui/const-generics/issues/issue-66906.stderr
 create mode 100644 src/test/ui/const-generics/issues/issue-70167.rs
 create mode 100644 src/test/ui/const-generics/issues/issue-70167.stderr

diff --git a/src/librustc_typeck/collect/type_of.rs b/src/librustc_typeck/collect/type_of.rs
index 41c205bc11b35..45587e5e90fec 100644
--- a/src/librustc_typeck/collect/type_of.rs
+++ b/src/librustc_typeck/collect/type_of.rs
@@ -256,15 +256,18 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
                         // figure out which generic parameter it corresponds to and return
                         // the relevant type.
                         let generics = match path.res {
-                            Res::Def(DefKind::Ctor(..), def_id) => {
+                            Res::Def(DefKind::Ctor(..), def_id)
+                            | Res::Def(DefKind::AssocTy, def_id) => {
                                 tcx.generics_of(tcx.parent(def_id).unwrap())
                             }
                             Res::Def(_, def_id) => tcx.generics_of(def_id),
-                            Res::Err => return tcx.types.err,
                             res => {
                                 tcx.sess.delay_span_bug(
                                     DUMMY_SP,
-                                    &format!("unexpected const parent path def {:?}", res,),
+                                    &format!(
+                                        "unexpected const parent path def, parent: {:?}, def: {:?}",
+                                        parent_node, res
+                                    ),
                                 );
                                 return tcx.types.err;
                             }
@@ -284,7 +287,16 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
                             .map(|param| tcx.type_of(param.def_id))
                             // This is no generic parameter associated with the arg. This is
                             // probably from an extra arg where one is not needed.
-                            .unwrap_or(tcx.types.err)
+                            .unwrap_or_else(|| {
+                                tcx.sess.delay_span_bug(
+                                    DUMMY_SP,
+                                    &format!(
+                                        "missing generic parameter for `AnonConst`, parent {:?}",
+                                        parent_node
+                                    ),
+                                );
+                                tcx.types.err
+                            })
                     } else {
                         tcx.sess.delay_span_bug(
                             DUMMY_SP,
diff --git a/src/test/ui/const-generics/issues/issue-66906.rs b/src/test/ui/const-generics/issues/issue-66906.rs
new file mode 100644
index 0000000000000..461fe837dac44
--- /dev/null
+++ b/src/test/ui/const-generics/issues/issue-66906.rs
@@ -0,0 +1,12 @@
+// check-pass
+
+#![feature(const_generics)]
+//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
+
+pub struct Tuple;
+
+pub trait Trait<const I: usize> {
+    type Input: From<<Self as Trait<I>>::Input>;
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-66906.stderr b/src/test/ui/const-generics/issues/issue-66906.stderr
new file mode 100644
index 0000000000000..f8710b67b687e
--- /dev/null
+++ b/src/test/ui/const-generics/issues/issue-66906.stderr
@@ -0,0 +1,8 @@
+warning: the feature `const_generics` is incomplete and may cause the compiler to crash
+  --> $DIR/issue-66906.rs:3:12
+   |
+LL | #![feature(const_generics)]
+   |            ^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(incomplete_features)]` on by default
+
diff --git a/src/test/ui/const-generics/issues/issue-70167.rs b/src/test/ui/const-generics/issues/issue-70167.rs
new file mode 100644
index 0000000000000..58fac8e05114a
--- /dev/null
+++ b/src/test/ui/const-generics/issues/issue-70167.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+#![feature(const_generics)]
+//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
+
+pub trait Trait<const N: usize>: From<<Self as Trait<N>>::Item> {
+  type Item;
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-70167.stderr b/src/test/ui/const-generics/issues/issue-70167.stderr
new file mode 100644
index 0000000000000..4ba3c204097dc
--- /dev/null
+++ b/src/test/ui/const-generics/issues/issue-70167.stderr
@@ -0,0 +1,8 @@
+warning: the feature `const_generics` is incomplete and may cause the compiler to crash
+  --> $DIR/issue-70167.rs:3:12
+   |
+LL | #![feature(const_generics)]
+   |            ^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(incomplete_features)]` on by default
+