make sure we don't inline these generic fn as that could monomorphize them

RalfJung · RalfJung · commit 8c01b85dba15 · 2024-03-21T09:05:47.000+01:00
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.noopt.stderr
@@ -7,7 +7,7 @@ LL |     const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn-behind-assoc-type.rs:15:17
+  --> $DIR/collect-in-dead-fn-behind-assoc-type.rs:16:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.opt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.opt.stderr
@@ -7,7 +7,7 @@ LL |     const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn-behind-assoc-type.rs:15:17
+  --> $DIR/collect-in-dead-fn-behind-assoc-type.rs:16:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.rs b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.rs
@@ -10,12 +10,14 @@ impl<T> Fail<T> {
     const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
 }
 
+#[inline(never)]
 fn not_called<T>() {
     if false {
         let _ = Fail::<T>::C;
     }
 }
 
+#[inline(never)]
 fn callit_not(f: impl Fn()) {
     if false {
         f();
@@ -33,6 +35,7 @@ impl Hideaway for () {
     const C: Self::T = not_called::<i32>;
 }
 
+#[inline(never)]
 fn reveal<T: Hideaway>() {
     if false {
         callit_not(T::C);
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.noopt.stderr
@@ -7,7 +7,7 @@ LL |     const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn-behind-generic.rs:14:17
+  --> $DIR/collect-in-dead-fn-behind-generic.rs:15:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.opt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.opt.stderr
@@ -7,7 +7,7 @@ LL |     const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn-behind-generic.rs:14:17
+  --> $DIR/collect-in-dead-fn-behind-generic.rs:15:17
    |
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.rs b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.rs
@@ -9,12 +9,14 @@ impl<T> Fail<T> {
     const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
 }
 
+#[inline(never)]
 fn not_called<T>() {
     if false {
         let _ = Fail::<T>::C;
     }
 }
 
+#[inline(never)]
 fn callit_not(f: impl Fn()) {
     if false {
         f();
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.noopt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.noopt.stderr
@@ -7,7 +7,7 @@ LL |         const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn-behind-opaque-type.rs:18:21
+  --> $DIR/collect-in-dead-fn-behind-opaque-type.rs:19:21
    |
 LL |             let _ = Fail::<T>::C;
    |                     ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.opt.stderr b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.opt.stderr
@@ -7,7 +7,7 @@ LL |         const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $DIR/collect-in-dead-fn-behind-opaque-type.rs:18:21
+  --> $DIR/collect-in-dead-fn-behind-opaque-type.rs:19:21
    |
 LL |             let _ = Fail::<T>::C;
    |                     ^^^^^^^^^^^^
diff --git a/tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.rs b/tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.rs
@@ -13,6 +13,7 @@ mod m {
 
     pub type NotCalledFn = impl Fn();
 
+    #[inline(never)]
     fn not_called<T>() {
         if false {
             let _ = Fail::<T>::C;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| const C: () = panic!();`
`7`	`7`	= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
`9`	`9`	`note: erroneous constant encountered`
`10`		`- --> $DIR/collect-in-dead-fn-behind-assoc-type.rs:15:17`
	`10`	`+ --> $DIR/collect-in-dead-fn-behind-assoc-type.rs:16:17`
`11`	`11`	`\|`
`12`	`12`	`LL \| let _ = Fail::<T>::C;`
`13`	`13`	`\| ^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,14 @@ impl<T> Fail<T> {`
`10`	`10`	const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
`11`	`11`	`}`
`12`	`12`
	`13`	`+#[inline(never)]`
`13`	`14`	`fn not_called<T>() {`
`14`	`15`	`if false {`
`15`	`16`	`let _ = Fail::<T>::C;`
`16`	`17`	`}`
`17`	`18`	`}`
`18`	`19`
	`20`	`+#[inline(never)]`
`19`	`21`	`fn callit_not(f: impl Fn()) {`
`20`	`22`	`if false {`
`21`	`23`	`f();`
`@@ -33,6 +35,7 @@ impl Hideaway for () {`
`33`	`35`	`const C: Self::T = not_called::<i32>;`
`34`	`36`	`}`
`35`	`37`
	`38`	`+#[inline(never)]`
`36`	`39`	`fn reveal<T: Hideaway>() {`
`37`	`40`	`if false {`
`38`	`41`	`callit_not(T::C);`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,14 @@ impl<T> Fail<T> {`
`9`	`9`	const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
`10`	`10`	`}`
`11`	`11`
	`12`	`+#[inline(never)]`
`12`	`13`	`fn not_called<T>() {`
`13`	`14`	`if false {`
`14`	`15`	`let _ = Fail::<T>::C;`
`15`	`16`	`}`
`16`	`17`	`}`
`17`	`18`
	`19`	`+#[inline(never)]`
`18`	`20`	`fn callit_not(f: impl Fn()) {`
`19`	`21`	`if false {`
`20`	`22`	`f();`