From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:03 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../branch-protection-missing-pac-ret.BADFLAGS.stderr      |  2 ++
 .../branch-protection-missing-pac-ret.BADTARGET.stderr     |  4 ++++
 .../branch-protection-missing-pac-ret.rs                   | 14 ++++++++++++++
 .../invalid-compile-flags/codegen-option-without-group.rs  |  1 +
 .../codegen-option-without-group.stderr                    |  2 ++
 .../ui/invalid-compile-flags/debug-option-without-group.rs |  1 +
 .../debug-option-without-group.stderr                      |  2 ++
 7 files changed, 26 insertions(+)
 create mode 100644 tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
 create mode 100644 tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
 create mode 100644 tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
 create mode 100644 tests/ui/invalid-compile-flags/codegen-option-without-group.rs
 create mode 100644 tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
 create mode 100644 tests/ui/invalid-compile-flags/debug-option-without-group.rs
 create mode 100644 tests/ui/invalid-compile-flags/debug-option-without-group.stderr

(limited to 'tests/ui/invalid-compile-flags')

diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
new file mode 100644
index 000000000..d0e8d4719
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `leaf` for unstable option `branch-protection` - a `,` separated combination of `bti`, `b-key`, `pac-ret`, or `leaf` was expected
+
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
new file mode 100644
index 000000000..52a591902
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
@@ -0,0 +1,4 @@
+error: `-Zbranch-protection` is only supported on aarch64
+
+error: aborting due to previous error
+
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
new file mode 100644
index 000000000..1d7ec5cba
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
@@ -0,0 +1,14 @@
+// revisions: BADFLAGS BADTARGET
+// [BADFLAGS] compile-flags: --target=aarch64-unknown-linux-gnu -Zbranch-protection=leaf
+// [BADFLAGS] check-fail
+// [BADFLAGS] needs-llvm-components: aarch64
+// [BADTARGET] compile-flags: --target=x86_64-unknown-linux-gnu -Zbranch-protection=bti
+// [BADTARGET] check-fail
+// [BADTARGET] needs-llvm-components: x86
+
+#![crate_type = "lib"]
+#![feature(no_core, lang_items)]
+#![no_core]
+
+#[lang="sized"]
+trait Sized { }
diff --git a/tests/ui/invalid-compile-flags/codegen-option-without-group.rs b/tests/ui/invalid-compile-flags/codegen-option-without-group.rs
new file mode 100644
index 000000000..7bbf47a38
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/codegen-option-without-group.rs
@@ -0,0 +1 @@
+// compile-flags: --llvm-args
diff --git a/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr b/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
new file mode 100644
index 000000000..c5a0c29ca
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
@@ -0,0 +1,2 @@
+error: Unrecognized option: 'llvm-args'. Did you mean `-C llvm-args`?
+
diff --git a/tests/ui/invalid-compile-flags/debug-option-without-group.rs b/tests/ui/invalid-compile-flags/debug-option-without-group.rs
new file mode 100644
index 000000000..86e40c178
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/debug-option-without-group.rs
@@ -0,0 +1 @@
+// compile-flags: --unpretty=hir
diff --git a/tests/ui/invalid-compile-flags/debug-option-without-group.stderr b/tests/ui/invalid-compile-flags/debug-option-without-group.stderr
new file mode 100644
index 000000000..0e57e31ad
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/debug-option-without-group.stderr
@@ -0,0 +1,2 @@
+error: Unrecognized option: 'unpretty'. Did you mean `-Z unpretty`?
+
-- 
cgit v1.2.3