Merging upstream version 1.68.2+dfsg1.

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

32 files changed, 11 insertions, 0 deletions

diff --git a/src/test/ui/lto/all-crates.rs b/tests/ui/lto/all-crates.rs
index e910b2a9f..e910b2a9f 100644
--- a/src/test/ui/lto/all-crates.rs
+++ b/tests/ui/lto/all-crates.rs
diff --git a/src/test/ui/lto/auxiliary/debuginfo-lto-aux.rs b/tests/ui/lto/auxiliary/debuginfo-lto-aux.rs
index dd471154b..dd471154b 100644
--- a/src/test/ui/lto/auxiliary/debuginfo-lto-aux.rs
+++ b/tests/ui/lto/auxiliary/debuginfo-lto-aux.rs
diff --git a/src/test/ui/lto/auxiliary/dylib.rs b/tests/ui/lto/auxiliary/dylib.rs
index e8b7f8f9f..e8b7f8f9f 100644
--- a/src/test/ui/lto/auxiliary/dylib.rs
+++ b/tests/ui/lto/auxiliary/dylib.rs
diff --git a/src/test/ui/lto/auxiliary/lto-duplicate-symbols1.rs b/tests/ui/lto/auxiliary/lto-duplicate-symbols1.rs
index ec6d05603..ec6d05603 100644
--- a/src/test/ui/lto/auxiliary/lto-duplicate-symbols1.rs
+++ b/tests/ui/lto/auxiliary/lto-duplicate-symbols1.rs
diff --git a/src/test/ui/lto/auxiliary/lto-duplicate-symbols2.rs b/tests/ui/lto/auxiliary/lto-duplicate-symbols2.rs
index ec6d05603..ec6d05603 100644
--- a/src/test/ui/lto/auxiliary/lto-duplicate-symbols2.rs
+++ b/tests/ui/lto/auxiliary/lto-duplicate-symbols2.rs
diff --git a/src/test/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs b/tests/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
index d24375b2d..d24375b2d 100644
--- a/src/test/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
+++ b/tests/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto/auxiliary/msvc-imp-present.rs b/tests/ui/lto/auxiliary/msvc-imp-present.rs
index 933af050a..933af050a 100644
--- a/src/test/ui/lto/auxiliary/msvc-imp-present.rs
+++ b/tests/ui/lto/auxiliary/msvc-imp-present.rs
diff --git a/src/test/ui/lto/auxiliary/thin-lto-inlines-aux.rs b/tests/ui/lto/auxiliary/thin-lto-inlines-aux.rs
index 5fd3f1996..5fd3f1996 100644
--- a/src/test/ui/lto/auxiliary/thin-lto-inlines-aux.rs
+++ b/tests/ui/lto/auxiliary/thin-lto-inlines-aux.rs
diff --git a/src/test/ui/lto/auxiliary/thinlto-dylib.rs b/tests/ui/lto/auxiliary/thinlto-dylib.rs
index 9d17c35da..9d17c35da 100644
--- a/src/test/ui/lto/auxiliary/thinlto-dylib.rs
+++ b/tests/ui/lto/auxiliary/thinlto-dylib.rs
diff --git a/src/test/ui/lto/debuginfo-lto.rs b/tests/ui/lto/debuginfo-lto.rs
index 43f75b034..43f75b034 100644
--- a/src/test/ui/lto/debuginfo-lto.rs
+++ b/tests/ui/lto/debuginfo-lto.rs
diff --git a/src/test/ui/lto/dylib-works.rs b/tests/ui/lto/dylib-works.rs
index 9e0782b59..9e0782b59 100644
--- a/src/test/ui/lto/dylib-works.rs
+++ b/tests/ui/lto/dylib-works.rs
diff --git a/src/test/ui/lto/fat-lto.rs b/tests/ui/lto/fat-lto.rs
index c8d8095a2..c8d8095a2 100644
--- a/src/test/ui/lto/fat-lto.rs
+++ b/tests/ui/lto/fat-lto.rs
diff --git a/tests/ui/lto/issue-100772.rs b/tests/ui/lto/issue-100772.rs
new file mode 100644
index 000000000..d6b067192
--- /dev/null
+++ b/tests/ui/lto/issue-100772.rs
@@ -0,0 +1,11 @@
+// run-pass
+// needs-sanitizer-cfi
+// compile-flags: -Clto -Ctarget-feature=-crt-static -Zsanitizer=cfi
+// no-prefer-dynamic
+// only-x86_64-unknown-linux-gnu
+
+#![feature(allocator_api)]
+
+fn main() {
+    let _ = Box::new_in(&[0, 1], &std::alloc::Global);
+}
diff --git a/src/test/ui/lto/issue-105637.rs b/tests/ui/lto/issue-105637.rs
index 0d9f0bec0..0d9f0bec0 100644
--- a/src/test/ui/lto/issue-105637.rs
+++ b/tests/ui/lto/issue-105637.rs
diff --git a/src/test/ui/lto/issue-105637.run.stderr b/tests/ui/lto/issue-105637.run.stderr
index 43388e776..43388e776 100644
--- a/src/test/ui/lto/issue-105637.run.stderr
+++ b/tests/ui/lto/issue-105637.run.stderr
diff --git a/src/test/ui/lto/issue-11154.rs b/tests/ui/lto/issue-11154.rs
index e11cdc82f..e11cdc82f 100644
--- a/src/test/ui/lto/issue-11154.rs
+++ b/tests/ui/lto/issue-11154.rs
diff --git a/src/test/ui/lto/issue-11154.stderr b/tests/ui/lto/issue-11154.stderr
index 8eec8b37c..8eec8b37c 100644
--- a/src/test/ui/lto/issue-11154.stderr
+++ b/tests/ui/lto/issue-11154.stderr
diff --git a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.rs b/tests/ui/lto/lto-and-no-bitcode-in-rlib.rs
index f381240e7..f381240e7 100644
--- a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.rs
+++ b/tests/ui/lto/lto-and-no-bitcode-in-rlib.rs
diff --git a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.stderr b/tests/ui/lto/lto-and-no-bitcode-in-rlib.stderr
index 11e370e91..11e370e91 100644
--- a/src/test/ui/lto/lto-and-no-bitcode-in-rlib.stderr
+++ b/tests/ui/lto/lto-and-no-bitcode-in-rlib.stderr
diff --git a/src/test/ui/lto/lto-duplicate-symbols.rs b/tests/ui/lto/lto-duplicate-symbols.rs
index e540094a3..e540094a3 100644
--- a/src/test/ui/lto/lto-duplicate-symbols.rs
+++ b/tests/ui/lto/lto-duplicate-symbols.rs
diff --git a/src/test/ui/lto/lto-duplicate-symbols.stderr b/tests/ui/lto/lto-duplicate-symbols.stderr
index f66afa94f..f66afa94f 100644
--- a/src/test/ui/lto/lto-duplicate-symbols.stderr
+++ b/tests/ui/lto/lto-duplicate-symbols.stderr
diff --git a/src/test/ui/lto/lto-many-codegen-units.rs b/tests/ui/lto/lto-many-codegen-units.rs
index f0f461ffe..f0f461ffe 100644
--- a/src/test/ui/lto/lto-many-codegen-units.rs
+++ b/tests/ui/lto/lto-many-codegen-units.rs
diff --git a/src/test/ui/lto/lto-opt-level-s.rs b/tests/ui/lto/lto-opt-level-s.rs
index a7d9d5024..a7d9d5024 100644
--- a/src/test/ui/lto/lto-opt-level-s.rs
+++ b/tests/ui/lto/lto-opt-level-s.rs
diff --git a/src/test/ui/lto/lto-opt-level-z.rs b/tests/ui/lto/lto-opt-level-z.rs
index bf1f5e2b2..bf1f5e2b2 100644
--- a/src/test/ui/lto/lto-opt-level-z.rs
+++ b/tests/ui/lto/lto-opt-level-z.rs
diff --git a/src/test/ui/lto/lto-rustc-loads-linker-plugin.rs b/tests/ui/lto/lto-rustc-loads-linker-plugin.rs
index 6ef1d4540..6ef1d4540 100644
--- a/src/test/ui/lto/lto-rustc-loads-linker-plugin.rs
+++ b/tests/ui/lto/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto/lto-still-runs-thread-dtors.rs b/tests/ui/lto/lto-still-runs-thread-dtors.rs
index 1c7368b36..1c7368b36 100644
--- a/src/test/ui/lto/lto-still-runs-thread-dtors.rs
+++ b/tests/ui/lto/lto-still-runs-thread-dtors.rs
diff --git a/src/test/ui/lto/lto-thin-rustc-loads-linker-plugin.rs b/tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
index 4d54ce32f..4d54ce32f 100644
--- a/src/test/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
+++ b/tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto/msvc-imp-present.rs b/tests/ui/lto/msvc-imp-present.rs
index 5498afb29..5498afb29 100644
--- a/src/test/ui/lto/msvc-imp-present.rs
+++ b/tests/ui/lto/msvc-imp-present.rs
diff --git a/src/test/ui/lto/thin-lto-global-allocator.rs b/tests/ui/lto/thin-lto-global-allocator.rs
index e00c5caf9..e00c5caf9 100644
--- a/src/test/ui/lto/thin-lto-global-allocator.rs
+++ b/tests/ui/lto/thin-lto-global-allocator.rs
diff --git a/src/test/ui/lto/thin-lto-inlines.rs b/tests/ui/lto/thin-lto-inlines.rs
index dca791807..dca791807 100644
--- a/src/test/ui/lto/thin-lto-inlines.rs
+++ b/tests/ui/lto/thin-lto-inlines.rs
diff --git a/src/test/ui/lto/thin-lto-inlines2.rs b/tests/ui/lto/thin-lto-inlines2.rs
index 1eb29657c..1eb29657c 100644
--- a/src/test/ui/lto/thin-lto-inlines2.rs
+++ b/tests/ui/lto/thin-lto-inlines2.rs
diff --git a/src/test/ui/lto/weak-works.rs b/tests/ui/lto/weak-works.rs
index 163a38702..163a38702 100644
--- a/src/test/ui/lto/weak-works.rs
+++ b/tests/ui/lto/weak-works.rs