Fix tests and lazy normalization gating. Also adds -Z lazy-normalization to some tests that require

skinnyBat · mati865 · commit 40887eb2eba8 · 2020-04-09T13:15:59.000+02:00
lazy normalization to pass.
diff --git a/src/librustc_infer/infer/combine.rs b/src/librustc_infer/infer/combine.rs
@@ -164,11 +164,15 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
             (_, ty::ConstKind::Infer(InferConst::Var(vid))) => {
                 return self.unify_const_variable(!a_is_expected, vid, a);
             }
-            (ty::ConstKind::Unevaluated(..), _) if self.tcx.sess.opts.debugging_opts.lazy_normalization => {
+            (ty::ConstKind::Unevaluated(..), _)
+                if self.tcx.sess.opts.debugging_opts.lazy_normalization =>
+            {
                 relation.const_equate_obligation(a, b);
                 return Ok(b);
             }
-            (_, ty::ConstKind::Unevaluated(..)) if self.tcx.sess.opts.debugging_opts.lazy_normalization => {
+            (_, ty::ConstKind::Unevaluated(..))
+                if self.tcx.sess.opts.debugging_opts.lazy_normalization =>
+            {
                 relation.const_equate_obligation(a, b);
                 return Ok(a);
             }
@@ -656,7 +660,11 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
                     }
                 }
             }
-            ty::ConstKind::Unevaluated(..) if self.tcx().sess.opts.debugging_opts.lazy_normalization => Ok(c),
+            ty::ConstKind::Unevaluated(..)
+                if self.tcx().sess.opts.debugging_opts.lazy_normalization =>
+            {
+                Ok(c)
+            }
             _ => relate::super_relate_consts(self, c, c),
         }
     }
diff --git a/src/librustc_infer/infer/nll_relate/mod.rs b/src/librustc_infer/infer/nll_relate/mod.rs
@@ -997,7 +997,11 @@ where
                     }
                 }
             }
-            ty::ConstKind::Unevaluated(..) if self.tcx().sess.opts.debugging_opts.lazy_normalization=> Ok(a),
+            ty::ConstKind::Unevaluated(..)
+                if self.tcx().sess.opts.debugging_opts.lazy_normalization =>
+            {
+                Ok(a)
+            }
             _ => relate::super_relate_consts(self, a, a),
         }
     }
diff --git a/src/librustc_trait_selection/traits/project.rs b/src/librustc_trait_selection/traits/project.rs
@@ -385,6 +385,14 @@ impl<'a, 'b, 'tcx> TypeFolder<'tcx> for AssocTypeNormalizer<'a, 'b, 'tcx> {
             _ => ty,
         }
     }
+
+    fn fold_const(&mut self, constant: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
+        if self.selcx.tcx().sess.opts.debugging_opts.lazy_normalization {
+            constant
+        } else {
+            constant.eval(self.selcx.tcx(), self.param_env)
+        }
+    }
 }
 
 /// The guts of `normalize`: normalize a specific projection like `<T
diff --git a/src/librustc_trait_selection/traits/query/normalize.rs b/src/librustc_trait_selection/traits/query/normalize.rs
@@ -189,4 +189,8 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
             _ => ty,
         }
     }
+
+    fn fold_const(&mut self, constant: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
+        constant.eval(self.infcx.tcx, self.param_env)
+    }
 }
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
@@ -1181,7 +1181,12 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
             Some(tcx.hir().local_def_id(parent_id))
         }
         Node::AnonConst(_) => {
-            if tcx.sess.opts.debugging_opts.lazy_normalization {
+            // HACK(skinny121) Provide correct generics if `feature(const_generics)` is enabled, in
+            // addition to when the '-Z lazy-normalization' flag is used, so that trait
+            // implementations that have const generic parameters within the standard library still
+            // work. The feature check won't be necessary when lazy normalization is enabled by
+            // default.
+            if tcx.sess.opts.debugging_opts.lazy_normalization || tcx.features().const_generics {
                 let parent_id = tcx.hir().get_parent_item(hir_id);
                 Some(tcx.hir().local_def_id(parent_id))
             } else {
diff --git a/src/test/ui/const-generics/issues/issue-61935.rs b/src/test/ui/const-generics/issues/issue-61935.rs
@@ -1,4 +1,5 @@
 // check-pass
+// compile-flags: -Z lazy-normalization
 
 #![feature(const_generics)]
 //~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
diff --git a/src/test/ui/const-generics/issues/issue-61935.stderr b/src/test/ui/const-generics/issues/issue-61935.stderr
@@ -1,5 +1,5 @@
 warning: the feature `const_generics` is incomplete and may cause the compiler to crash
-  --> $DIR/issue-61935.rs:3:12
+  --> $DIR/issue-61935.rs:4:12
    |
 LL | #![feature(const_generics)]
    |            ^^^^^^^^^^^^^^
diff --git a/src/test/ui/const-generics/issues/issue-67185-1.rs b/src/test/ui/const-generics/issues/issue-67185-1.rs
@@ -1,4 +1,5 @@
 // check-pass
+// compile-flags: -Z lazy-normalization
 
 #![feature(const_generics)]
 //~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
diff --git a/src/test/ui/const-generics/issues/issue-67185-1.stderr b/src/test/ui/const-generics/issues/issue-67185-1.stderr
@@ -1,5 +1,5 @@
 warning: the feature `const_generics` is incomplete and may cause the compiler to crash
-  --> $DIR/issue-67185-1.rs:3:12
+  --> $DIR/issue-67185-1.rs:4:12
    |
 LL | #![feature(const_generics)]
    |            ^^^^^^^^^^^^^^
diff --git a/src/test/ui/const-generics/issues/issue-67185-2.rs b/src/test/ui/const-generics/issues/issue-67185-2.rs
@@ -1,3 +1,5 @@
+// compile-flags: -Z lazy-normalization
+
 #![feature(const_generics)]
 //~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
 
diff --git a/src/test/ui/const-generics/issues/issue-67185-2.stderr b/src/test/ui/const-generics/issues/issue-67185-2.stderr
@@ -1,13 +1,13 @@
 warning: the feature `const_generics` is incomplete and may cause the compiler to crash
-  --> $DIR/issue-67185-2.rs:1:12
+  --> $DIR/issue-67185-2.rs:3:12
    |
 LL | #![feature(const_generics)]
    |            ^^^^^^^^^^^^^^
    |
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0308]: mismatched types
-  --> $DIR/issue-67185-2.rs:15:1
+  --> $DIR/issue-67185-2.rs:17:1
    |
 LL | / trait Foo
 LL | |     where
@@ -21,7 +21,7 @@ LL | | }
               found type `4usize`
 
 error[E0308]: mismatched types
-  --> $DIR/issue-67185-2.rs:24:6
+  --> $DIR/issue-67185-2.rs:26:6
    |
 LL | impl Foo for FooImpl {}
    |      ^^^ expected `3usize`, found `4usize`
@@ -30,7 +30,7 @@ LL | impl Foo for FooImpl {}
               found type `4usize`
 
 error[E0308]: mismatched types
-  --> $DIR/issue-67185-2.rs:24:6
+  --> $DIR/issue-67185-2.rs:26:6
    |
 LL | impl Foo for FooImpl {}
    |      ^^^ expected `2usize`, found `3usize`
@@ -39,7 +39,7 @@ LL | impl Foo for FooImpl {}
               found type `3usize`
 
 error[E0308]: mismatched types
-  --> $DIR/issue-67185-2.rs:28:1
+  --> $DIR/issue-67185-2.rs:30:1
    |
 LL | fn f(_: impl Foo) {}
    | ^^^^^^^^^^^^^^^^^^^^ expected `2usize`, found `3usize`
@@ -48,7 +48,7 @@ LL | fn f(_: impl Foo) {}
               found type `3usize`
 
 error[E0308]: mismatched types
-  --> $DIR/issue-67185-2.rs:28:1
+  --> $DIR/issue-67185-2.rs:30:1
    |
 LL | fn f(_: impl Foo) {}
    | ^^^^^^^^^^^^^^^^^^^^ expected `3usize`, found `4usize`
diff --git a/src/test/ui/const-generics/trait-const-args.rs b/src/test/ui/const-generics/trait-const-args.rs
@@ -1,4 +1,5 @@
 // check-pass
+// compile-flags: -Z lazy-normalization
 
 #![feature(const_generics)]
 //~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
@@ -26,4 +27,4 @@ fn main() {
     // FIXME this causes a stack overflow in rustc
     // foo_where(Const);
     foo_where(Const::<3>);
-}
+}
diff --git a/src/test/ui/const-generics/trait-const-args.stderr b/src/test/ui/const-generics/trait-const-args.stderr
@@ -1,5 +1,5 @@
 warning: the feature `const_generics` is incomplete and may cause the compiler to crash
-  --> $DIR/trait-const-args.rs:3:12
+  --> $DIR/trait-const-args.rs:4:12
    |
 LL | #![feature(const_generics)]
    |            ^^^^^^^^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -164,11 +164,15 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {`
`164`	`164`	`(_, ty::ConstKind::Infer(InferConst::Var(vid))) => {`
`165`	`165`	`return self.unify_const_variable(!a_is_expected, vid, a);`
`166`	`166`	`}`
`167`		`- (ty::ConstKind::Unevaluated(..), _) if self.tcx.sess.opts.debugging_opts.lazy_normalization => {`
	`167`	`+ (ty::ConstKind::Unevaluated(..), _)`
	`168`	`+ if self.tcx.sess.opts.debugging_opts.lazy_normalization =>`
	`169`	`+ {`
`168`	`170`	`relation.const_equate_obligation(a, b);`
`169`	`171`	`return Ok(b);`
`170`	`172`	`}`
`171`		`- (_, ty::ConstKind::Unevaluated(..)) if self.tcx.sess.opts.debugging_opts.lazy_normalization => {`
	`173`	`+ (_, ty::ConstKind::Unevaluated(..))`
	`174`	`+ if self.tcx.sess.opts.debugging_opts.lazy_normalization =>`
	`175`	`+ {`
`172`	`176`	`relation.const_equate_obligation(a, b);`
`173`	`177`	`return Ok(a);`
`174`	`178`	`}`
`@@ -656,7 +660,11 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {`
`656`	`660`	`}`
`657`	`661`	`}`
`658`	`662`	`}`
`659`		`- ty::ConstKind::Unevaluated(..) if self.tcx().sess.opts.debugging_opts.lazy_normalization => Ok(c),`
	`663`	`+ ty::ConstKind::Unevaluated(..)`
	`664`	`+ if self.tcx().sess.opts.debugging_opts.lazy_normalization =>`
	`665`	`+ {`
	`666`	`+ Ok(c)`
	`667`	`+ }`
`660`	`668`	`_ => relate::super_relate_consts(self, c, c),`
`661`	`669`	`}`
`662`	`670`	`}`
Original file line number	Diff line number	Diff line change
`@@ -997,7 +997,11 @@ where`
`997`	`997`	`}`
`998`	`998`	`}`
`999`	`999`	`}`
`1000`		`- ty::ConstKind::Unevaluated(..) if self.tcx().sess.opts.debugging_opts.lazy_normalization=> Ok(a),`
	`1000`	`+ ty::ConstKind::Unevaluated(..)`
	`1001`	`+ if self.tcx().sess.opts.debugging_opts.lazy_normalization =>`
	`1002`	`+ {`
	`1003`	`+ Ok(a)`
	`1004`	`+ }`
`1001`	`1005`	`_ => relate::super_relate_consts(self, a, a),`
`1002`	`1006`	`}`
`1003`	`1007`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,14 @@ impl<'a, 'b, 'tcx> TypeFolder<'tcx> for AssocTypeNormalizer<'a, 'b, 'tcx> {`
`385`	`385`	`_ => ty,`
`386`	`386`	`}`
`387`	`387`	`}`
	`388`	`+`
	`389`	`+ fn fold_const(&mut self, constant: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {`
	`390`	`+ if self.selcx.tcx().sess.opts.debugging_opts.lazy_normalization {`
	`391`	`+ constant`
	`392`	`+ } else {`
	`393`	`+ constant.eval(self.selcx.tcx(), self.param_env)`
	`394`	`+ }`
	`395`	`+ }`
`388`	`396`	`}`
`389`	`397`
`390`	`398`	/// The guts of `normalize`: normalize a specific projection like `<T
Original file line number	Diff line number	Diff line change
`@@ -189,4 +189,8 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {`
`189`	`189`	`_ => ty,`
`190`	`190`	`}`
`191`	`191`	`}`
	`192`	`+`
	`193`	`+ fn fold_const(&mut self, constant: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {`
	`194`	`+ constant.eval(self.infcx.tcx, self.param_env)`
	`195`	`+ }`
`192`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// check-pass`
	`2`	`+// compile-flags: -Z lazy-normalization`
`2`	`3`
`3`	`4`	`#![feature(const_generics)]`
`4`	`5`	//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	warning: the feature `const_generics` is incomplete and may cause the compiler to crash
`2`		`- --> $DIR/issue-61935.rs:3:12`
	`2`	`+ --> $DIR/issue-61935.rs:4:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| #![feature(const_generics)]`
`5`	`5`	`\| ^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	warning: the feature `const_generics` is incomplete and may cause the compiler to crash
`2`		`- --> $DIR/issue-67185-1.rs:3:12`
	`2`	`+ --> $DIR/issue-67185-1.rs:4:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| #![feature(const_generics)]`
`5`	`5`	`\| ^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// compile-flags: -Z lazy-normalization`
	`2`	`+`
`1`	`3`	`#![feature(const_generics)]`
`2`	`4`	//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	warning: the feature `const_generics` is incomplete and may cause the compiler to crash
`2`		`- --> $DIR/trait-const-args.rs:3:12`
	`2`	`+ --> $DIR/trait-const-args.rs:4:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| #![feature(const_generics)]`
`5`	`5`	`\| ^^^^^^^^^^^^^^`