Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/ui/consts/miri_unleashed/tls.stderr b/tests/ui/consts/miri_unleashed/tls.stderr
new file mode 100644
index 000000000..7aaeadd04
--- /dev/null
+++ b/tests/ui/consts/miri_unleashed/tls.stderr
@@ -0,0 +1,28 @@
+error[E0080]: could not evaluate static initializer
+  --> $DIR/tls.rs:11:25
+   |
+LL |     unsafe { let _val = A; }
+   |                         ^ cannot access thread local static (DefId(0:4 ~ tls[78b0]::A))
+
+error[E0080]: could not evaluate static initializer
+  --> $DIR/tls.rs:18:26
+   |
+LL |     unsafe { let _val = &A; }
+   |                          ^ cannot access thread local static (DefId(0:4 ~ tls[78b0]::A))
+
+warning: skipping const checks
+   |
+help: skipping check that does not even have a feature gate
+  --> $DIR/tls.rs:11:25
+   |
+LL |     unsafe { let _val = A; }
+   |                         ^
+help: skipping check that does not even have a feature gate
+  --> $DIR/tls.rs:18:26
+   |
+LL |     unsafe { let _val = &A; }
+   |                          ^
+
+error: aborting due to 2 previous errors; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0080`.