Unrolled build for rust-lang#123675

rust-timer · web-flow · commit 5d6c730fe8f9 · 2024-04-16T22:07:03.000-04:00
Rollup merge of rust-lang#123675 - oli-obk:static_wf_ice, r=compiler-errors Taint const qualifs if a static is referenced that didn't pass wfcheck It is correct to only check the signature here, as the ICE is caused by `USE_WITH_ERROR` trying to allocate memory to store the result of `WITH_ERROR` before evaluating it. fixes rust-lang#123153
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/check.rs b/compiler/rustc_const_eval/src/transform/check_consts/check.rs
@@ -331,6 +331,11 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
         if self.tcx.is_thread_local_static(def_id) {
             self.tcx.dcx().span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef`");
         }
+        if let Some(def_id) = def_id.as_local()
+            && let Err(guar) = self.tcx.at(span).check_well_formed(hir::OwnerId { def_id })
+        {
+            self.error_emitted = Some(guar);
+        }
         self.check_op_spanned(ops::StaticAccess, span)
     }
 
diff --git a/tests/crashes/123153.rs b/tests/crashes/123153.rs
diff --git a/tests/ui/statics/unsized_type2.rs b/tests/ui/statics/unsized_type2.rs
@@ -0,0 +1,21 @@
+//! This test used to actually start evaluating the static even though
+//! there were errors in typeck.
+//! issue: rust-lang/rust#123153
+
+pub struct Foo {
+    pub version: str,
+}
+
+pub struct Bar {
+    pub ok: &'static [&'static Bar],
+    pub bad: &'static Foo,
+}
+
+pub static WITH_ERROR: Foo = Foo { version: 0 };
+//~^ ERROR the size for values of type `str` cannot be known at compilation time
+//~| ERROR the size for values of type `str` cannot be known at compilation time
+//~| ERROR mismatched types
+
+pub static USE_WITH_ERROR: Bar = Bar { ok: &[], bad: &WITH_ERROR };
+
+fn main() {}
diff --git a/tests/ui/statics/unsized_type2.stderr b/tests/ui/statics/unsized_type2.stderr
@@ -0,0 +1,37 @@
+error[E0277]: the size for values of type `str` cannot be known at compilation time
+  --> $DIR/unsized_type2.rs:14:24
+   |
+LL | pub static WITH_ERROR: Foo = Foo { version: 0 };
+   |                        ^^^ doesn't have a size known at compile-time
+   |
+   = help: within `Foo`, the trait `Sized` is not implemented for `str`, which is required by `Foo: Sized`
+note: required because it appears within the type `Foo`
+  --> $DIR/unsized_type2.rs:5:12
+   |
+LL | pub struct Foo {
+   |            ^^^
+
+error[E0277]: the size for values of type `str` cannot be known at compilation time
+  --> $DIR/unsized_type2.rs:14:30
+   |
+LL | pub static WITH_ERROR: Foo = Foo { version: 0 };
+   |                              ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: within `Foo`, the trait `Sized` is not implemented for `str`, which is required by `Foo: Sized`
+note: required because it appears within the type `Foo`
+  --> $DIR/unsized_type2.rs:5:12
+   |
+LL | pub struct Foo {
+   |            ^^^
+   = note: constant expressions must have a statically known size
+
+error[E0308]: mismatched types
+  --> $DIR/unsized_type2.rs:14:45
+   |
+LL | pub static WITH_ERROR: Foo = Foo { version: 0 };
+   |                                             ^ expected `str`, found integer
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,11 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {`
`331`	`331`	`if self.tcx.is_thread_local_static(def_id) {`
`332`	`332`	self.tcx.dcx().span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef`");
`333`	`333`	`}`
	`334`	`+ if let Some(def_id) = def_id.as_local()`
	`335`	`+ && let Err(guar) = self.tcx.at(span).check_well_formed(hir::OwnerId { def_id })`
	`336`	`+ {`
	`337`	`+ self.error_emitted = Some(guar);`
	`338`	`+ }`
`334`	`339`	`self.check_op_spanned(ops::StaticAccess, span)`
`335`	`340`	`}`
`336`	`341`