Merging upstream version 1.68.2+dfsg1.

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

56 files changed, 38 insertions, 4 deletions

diff --git a/src/test/assembly/aarch64-naked-fn-no-bti-prolog.rs b/tests/assembly/aarch64-naked-fn-no-bti-prolog.rs
index 79b0bb2d7..79b0bb2d7 100644
--- a/src/test/assembly/aarch64-naked-fn-no-bti-prolog.rs
+++ b/tests/assembly/aarch64-naked-fn-no-bti-prolog.rs
diff --git a/src/test/assembly/aarch64-pointer-auth.rs b/tests/assembly/aarch64-pointer-auth.rs
index da14cd026..da14cd026 100644
--- a/src/test/assembly/aarch64-pointer-auth.rs
+++ b/tests/assembly/aarch64-pointer-auth.rs
diff --git a/src/test/assembly/align_offset.rs b/tests/assembly/align_offset.rs
index c5eefca34..c5eefca34 100644
--- a/src/test/assembly/align_offset.rs
+++ b/tests/assembly/align_offset.rs
diff --git a/src/test/assembly/asm/aarch64-el2vmsa.rs b/tests/assembly/asm/aarch64-el2vmsa.rs
index 1908ffb8f..1908ffb8f 100644
--- a/src/test/assembly/asm/aarch64-el2vmsa.rs
+++ b/tests/assembly/asm/aarch64-el2vmsa.rs
diff --git a/src/test/assembly/asm/aarch64-modifiers.rs b/tests/assembly/asm/aarch64-modifiers.rs
index 5196aa9fa..5196aa9fa 100644
--- a/src/test/assembly/asm/aarch64-modifiers.rs
+++ b/tests/assembly/asm/aarch64-modifiers.rs
diff --git a/src/test/assembly/asm/aarch64-outline-atomics.rs b/tests/assembly/asm/aarch64-outline-atomics.rs
index c2ec4e911..c2ec4e911 100644
--- a/src/test/assembly/asm/aarch64-outline-atomics.rs
+++ b/tests/assembly/asm/aarch64-outline-atomics.rs
diff --git a/src/test/assembly/asm/aarch64-types.rs b/tests/assembly/asm/aarch64-types.rs
index 66c39a48c..66c39a48c 100644
--- a/src/test/assembly/asm/aarch64-types.rs
+++ b/tests/assembly/asm/aarch64-types.rs
diff --git a/src/test/assembly/asm/arm-modifiers.rs b/tests/assembly/asm/arm-modifiers.rs
index 88ffeaecf..88ffeaecf 100644
--- a/src/test/assembly/asm/arm-modifiers.rs
+++ b/tests/assembly/asm/arm-modifiers.rs
diff --git a/src/test/assembly/asm/arm-types.rs b/tests/assembly/asm/arm-types.rs
index b22a26ce3..b22a26ce3 100644
--- a/src/test/assembly/asm/arm-types.rs
+++ b/tests/assembly/asm/arm-types.rs
diff --git a/src/test/assembly/asm/avr-modifiers.rs b/tests/assembly/asm/avr-modifiers.rs
index ffdc8f2e3..ffdc8f2e3 100644
--- a/src/test/assembly/asm/avr-modifiers.rs
+++ b/tests/assembly/asm/avr-modifiers.rs
diff --git a/src/test/assembly/asm/avr-types.rs b/tests/assembly/asm/avr-types.rs
index b2d11a882..b2d11a882 100644
--- a/src/test/assembly/asm/avr-types.rs
+++ b/tests/assembly/asm/avr-types.rs
diff --git a/src/test/assembly/asm/bpf-types.rs b/tests/assembly/asm/bpf-types.rs
index e177b8d0d..e177b8d0d 100644
--- a/src/test/assembly/asm/bpf-types.rs
+++ b/tests/assembly/asm/bpf-types.rs
diff --git a/src/test/assembly/asm/global_asm.rs b/tests/assembly/asm/global_asm.rs
index 0b361a7ed..0b361a7ed 100644
--- a/src/test/assembly/asm/global_asm.rs
+++ b/tests/assembly/asm/global_asm.rs
diff --git a/src/test/assembly/asm/hexagon-types.rs b/tests/assembly/asm/hexagon-types.rs
index af16faedb..af16faedb 100644
--- a/src/test/assembly/asm/hexagon-types.rs
+++ b/tests/assembly/asm/hexagon-types.rs
diff --git a/src/test/assembly/asm/mips-types.rs b/tests/assembly/asm/mips-types.rs
index 6aa28b062..6aa28b062 100644
--- a/src/test/assembly/asm/mips-types.rs
+++ b/tests/assembly/asm/mips-types.rs
diff --git a/src/test/assembly/asm/msp430-types.rs b/tests/assembly/asm/msp430-types.rs
index 2c73b3b09..2c73b3b09 100644
--- a/src/test/assembly/asm/msp430-types.rs
+++ b/tests/assembly/asm/msp430-types.rs
diff --git a/src/test/assembly/asm/nvptx-types.rs b/tests/assembly/asm/nvptx-types.rs
index c319946b5..c319946b5 100644
--- a/src/test/assembly/asm/nvptx-types.rs
+++ b/tests/assembly/asm/nvptx-types.rs
diff --git a/src/test/assembly/asm/powerpc-types.rs b/tests/assembly/asm/powerpc-types.rs
index e27b00520..e27b00520 100644
--- a/src/test/assembly/asm/powerpc-types.rs
+++ b/tests/assembly/asm/powerpc-types.rs
diff --git a/src/test/assembly/asm/riscv-types.rs b/tests/assembly/asm/riscv-types.rs
index f18ba294d..f18ba294d 100644
--- a/src/test/assembly/asm/riscv-types.rs
+++ b/tests/assembly/asm/riscv-types.rs
diff --git a/src/test/assembly/asm/s390x-types.rs b/tests/assembly/asm/s390x-types.rs
index 2fb404dd9..2fb404dd9 100644
--- a/src/test/assembly/asm/s390x-types.rs
+++ b/tests/assembly/asm/s390x-types.rs
diff --git a/src/test/assembly/asm/wasm-types.rs b/tests/assembly/asm/wasm-types.rs
index 3b1ac1b45..3b1ac1b45 100644
--- a/src/test/assembly/asm/wasm-types.rs
+++ b/tests/assembly/asm/wasm-types.rs
diff --git a/src/test/assembly/asm/x86-modifiers.rs b/tests/assembly/asm/x86-modifiers.rs
index 574fdf12c..574fdf12c 100644
--- a/src/test/assembly/asm/x86-modifiers.rs
+++ b/tests/assembly/asm/x86-modifiers.rs
diff --git a/src/test/assembly/asm/x86-types.rs b/tests/assembly/asm/x86-types.rs
index 81be79cba..81be79cba 100644
--- a/src/test/assembly/asm/x86-types.rs
+++ b/tests/assembly/asm/x86-types.rs
diff --git a/src/test/assembly/auxiliary/breakpoint-panic-handler.rs b/tests/assembly/auxiliary/breakpoint-panic-handler.rs
index d54c1181e..d54c1181e 100644
--- a/src/test/assembly/auxiliary/breakpoint-panic-handler.rs
+++ b/tests/assembly/auxiliary/breakpoint-panic-handler.rs
diff --git a/src/test/assembly/auxiliary/non-inline-dependency.rs b/tests/assembly/auxiliary/non-inline-dependency.rs
index 57f3ee87c..57f3ee87c 100644
--- a/src/test/assembly/auxiliary/non-inline-dependency.rs
+++ b/tests/assembly/auxiliary/non-inline-dependency.rs
diff --git a/src/test/assembly/dwarf5.rs b/tests/assembly/dwarf5.rs
index f41e6bd55..f41e6bd55 100644
--- a/src/test/assembly/dwarf5.rs
+++ b/tests/assembly/dwarf5.rs
diff --git a/src/test/assembly/is_aligned.rs b/tests/assembly/is_aligned.rs
index 04b5de834..620a3da94 100644
--- a/src/test/assembly/is_aligned.rs
+++ b/tests/assembly/is_aligned.rs
@@ -1,5 +1,5 @@
 // assembly-output: emit-asm
-// min-llvm-version: 14.0
+// min-llvm-version: 15.0
 // only-x86_64
 // revisions: opt-speed opt-size
 // [opt-speed] compile-flags: -Copt-level=1
diff --git a/src/test/assembly/niche-prefer-zero.rs b/tests/assembly/niche-prefer-zero.rs
index 0ab37a618..0ab37a618 100644
--- a/src/test/assembly/niche-prefer-zero.rs
+++ b/tests/assembly/niche-prefer-zero.rs
diff --git a/src/test/assembly/nvptx-arch-default.rs b/tests/assembly/nvptx-arch-default.rs
index 8a71a6370..8a71a6370 100644
--- a/src/test/assembly/nvptx-arch-default.rs
+++ b/tests/assembly/nvptx-arch-default.rs
diff --git a/src/test/assembly/nvptx-arch-emit-asm.rs b/tests/assembly/nvptx-arch-emit-asm.rs
index b252b450f..b252b450f 100644
--- a/src/test/assembly/nvptx-arch-emit-asm.rs
+++ b/tests/assembly/nvptx-arch-emit-asm.rs
diff --git a/src/test/assembly/nvptx-arch-link-arg.rs b/tests/assembly/nvptx-arch-link-arg.rs
index 025a9ad49..025a9ad49 100644
--- a/src/test/assembly/nvptx-arch-link-arg.rs
+++ b/tests/assembly/nvptx-arch-link-arg.rs
diff --git a/src/test/assembly/nvptx-arch-target-cpu.rs b/tests/assembly/nvptx-arch-target-cpu.rs
index 824ee9cd8..824ee9cd8 100644
--- a/src/test/assembly/nvptx-arch-target-cpu.rs
+++ b/tests/assembly/nvptx-arch-target-cpu.rs
diff --git a/src/test/assembly/nvptx-atomics.rs b/tests/assembly/nvptx-atomics.rs
index f96398064..f96398064 100644
--- a/src/test/assembly/nvptx-atomics.rs
+++ b/tests/assembly/nvptx-atomics.rs
diff --git a/src/test/assembly/nvptx-internalizing.rs b/tests/assembly/nvptx-internalizing.rs
index 0004fcea7..0004fcea7 100644
--- a/src/test/assembly/nvptx-internalizing.rs
+++ b/tests/assembly/nvptx-internalizing.rs
diff --git a/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
index 5bf44f949..5bf44f949 100644
--- a/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
+++ b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
diff --git a/src/test/assembly/nvptx-linking-binary.rs b/tests/assembly/nvptx-linking-binary.rs
index 64b9c2f17..64b9c2f17 100644
--- a/src/test/assembly/nvptx-linking-binary.rs
+++ b/tests/assembly/nvptx-linking-binary.rs
diff --git a/src/test/assembly/nvptx-linking-cdylib.rs b/tests/assembly/nvptx-linking-cdylib.rs
index bdbc30ea9..bdbc30ea9 100644
--- a/src/test/assembly/nvptx-linking-cdylib.rs
+++ b/tests/assembly/nvptx-linking-cdylib.rs
diff --git a/src/test/assembly/nvptx-safe-naming.rs b/tests/assembly/nvptx-safe-naming.rs
index 80bb04fc0..80bb04fc0 100644
--- a/src/test/assembly/nvptx-safe-naming.rs
+++ b/tests/assembly/nvptx-safe-naming.rs
diff --git a/src/test/assembly/panic-no-unwind-no-uwtable.rs b/tests/assembly/panic-no-unwind-no-uwtable.rs
index 499d4e698..499d4e698 100644
--- a/src/test/assembly/panic-no-unwind-no-uwtable.rs
+++ b/tests/assembly/panic-no-unwind-no-uwtable.rs
diff --git a/src/test/assembly/panic-unwind-no-uwtable.rs b/tests/assembly/panic-unwind-no-uwtable.rs
index 8eed72b2f..8eed72b2f 100644
--- a/src/test/assembly/panic-unwind-no-uwtable.rs
+++ b/tests/assembly/panic-unwind-no-uwtable.rs
diff --git a/src/test/assembly/pic-relocation-model.rs b/tests/assembly/pic-relocation-model.rs
index 72471ffcd..72471ffcd 100644
--- a/src/test/assembly/pic-relocation-model.rs
+++ b/tests/assembly/pic-relocation-model.rs
diff --git a/src/test/assembly/pie-relocation-model.rs b/tests/assembly/pie-relocation-model.rs
index e40797e03..e40797e03 100644
--- a/src/test/assembly/pie-relocation-model.rs
+++ b/tests/assembly/pie-relocation-model.rs
diff --git a/src/test/assembly/sparc-struct-abi.rs b/tests/assembly/sparc-struct-abi.rs
index 6309dd420..6309dd420 100644
--- a/src/test/assembly/sparc-struct-abi.rs
+++ b/tests/assembly/sparc-struct-abi.rs
diff --git a/src/test/assembly/stack-protector/stack-protector-heuristics-effect.rs b/tests/assembly/stack-protector/stack-protector-heuristics-effect.rs
index 7c2b60550..7c2b60550 100644
--- a/src/test/assembly/stack-protector/stack-protector-heuristics-effect.rs
+++ b/tests/assembly/stack-protector/stack-protector-heuristics-effect.rs
diff --git a/src/test/assembly/stack-protector/stack-protector-target-support.rs b/tests/assembly/stack-protector/stack-protector-target-support.rs
index 2fb62e93e..d5b48105e 100644
--- a/src/test/assembly/stack-protector/stack-protector-target-support.rs
+++ b/tests/assembly/stack-protector/stack-protector-target-support.rs
@@ -26,7 +26,7 @@
 // [r9] needs-llvm-components: aarch64
 // [r10] compile-flags: --target aarch64-apple-ios
 // [r10] needs-llvm-components: aarch64
-// [r11] compile-flags: --target aarch64-fuchsia
+// [r11] compile-flags: --target aarch64-unknown-fuchsia
 // [r11] needs-llvm-components: aarch64
 // [r12] compile-flags: --target aarch64-linux-android
 // [r12] needs-llvm-components: aarch64
@@ -156,7 +156,7 @@
 // [r74] needs-llvm-components: x86
 // [r75] compile-flags:--target x86_64-fortanix-unknown-sgx
 // [r75] needs-llvm-components: x86
-// [r76] compile-flags:--target x86_64-fuchsia
+// [r76] compile-flags:--target x86_64-unknown-fuchsia
 // [r76] needs-llvm-components: x86
 // [r77] compile-flags:--target x86_64-linux-android
 // [r77] needs-llvm-components: x86
diff --git a/src/test/assembly/static-relocation-model.rs b/tests/assembly/static-relocation-model.rs
index faa2e3952..faa2e3952 100644
--- a/src/test/assembly/static-relocation-model.rs
+++ b/tests/assembly/static-relocation-model.rs
diff --git a/src/test/assembly/strict_provenance.rs b/tests/assembly/strict_provenance.rs
index 01f1957d5..01f1957d5 100644
--- a/src/test/assembly/strict_provenance.rs
+++ b/tests/assembly/strict_provenance.rs
diff --git a/src/test/assembly/target-feature-multiple.rs b/tests/assembly/target-feature-multiple.rs
index 18d896e86..5c5d93863 100644
--- a/src/test/assembly/target-feature-multiple.rs
+++ b/tests/assembly/target-feature-multiple.rs
@@ -14,7 +14,7 @@
 // > LLVM ERROR: Cannot select: 0x7f00f400c010: i32,i32,ch = X86ISD::RDSEED 0x7f00f400bfa8:2
 // > In function: foo
 //
-// See also src/test/codegen/target-feature-overrides.rs
+// See also tests/codegen/target-feature-overrides.rs
 #![feature(no_core, lang_items, link_llvm_intrinsics, abi_unadjusted)]
 #![crate_type = "lib"]
 #![no_core]
diff --git a/src/test/assembly/x86-stack-probes.rs b/tests/assembly/x86-stack-probes.rs
index c7141fb20..c7141fb20 100644
--- a/src/test/assembly/x86-stack-probes.rs
+++ b/tests/assembly/x86-stack-probes.rs
diff --git a/src/test/assembly/x86_64-floating-point-clamp.rs b/tests/assembly/x86_64-floating-point-clamp.rs
index 0f3b465d0..0f3b465d0 100644
--- a/src/test/assembly/x86_64-floating-point-clamp.rs
+++ b/tests/assembly/x86_64-floating-point-clamp.rs
diff --git a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs
index 79d82cf70..79d82cf70 100644
--- a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs
+++ b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs
diff --git a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs
index a21ef6b75..a21ef6b75 100644
--- a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs
+++ b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs
diff --git a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs
index c316379d5..c316379d5 100644
--- a/src/test/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs
+++ b/tests/assembly/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs
diff --git a/src/test/assembly/x86_64-naked-fn-no-cet-prolog.rs b/tests/assembly/x86_64-naked-fn-no-cet-prolog.rs
index bedcded73..bedcded73 100644
--- a/src/test/assembly/x86_64-naked-fn-no-cet-prolog.rs
+++ b/tests/assembly/x86_64-naked-fn-no-cet-prolog.rs
diff --git a/tests/assembly/x86_64-no-jump-tables.rs b/tests/assembly/x86_64-no-jump-tables.rs
new file mode 100644
index 000000000..007c3591a
--- /dev/null
+++ b/tests/assembly/x86_64-no-jump-tables.rs
@@ -0,0 +1,34 @@
+// Test that jump tables are (not) emitted when the `-Zno-jump-tables`
+// flag is (not) set.
+
+// revisions: unset set
+// assembly-output: emit-asm
+// compile-flags: -O
+// [set] compile-flags: -Zno-jump-tables
+// only-x86_64
+
+#![crate_type = "lib"]
+
+extern "C" {
+    fn bar1();
+    fn bar2();
+    fn bar3();
+    fn bar4();
+    fn bar5();
+    fn bar6();
+}
+
+// CHECK-LABEL: foo:
+#[no_mangle]
+pub unsafe fn foo(x: i32) {
+    // unset: LJTI0_0
+    // set-NOT: LJTI0_0
+    match x {
+        1 => bar1(),
+        2 => bar2(),
+        3 => bar3(),
+        4 => bar4(),
+        5 => bar5(),
+        _ => bar6(),
+    }
+}
diff --git a/src/test/assembly/x86_64-sse_crc.rs b/tests/assembly/x86_64-sse_crc.rs
index cdbf057b8..cdbf057b8 100644
--- a/src/test/assembly/x86_64-sse_crc.rs
+++ b/tests/assembly/x86_64-sse_crc.rs