Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 29 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-18804/auxiliary/lib.rs b/tests/ui/issues/issue-18804/auxiliary/lib.rs
new file mode 100644
index 000000000..e29d48285
--- /dev/null
+++ b/tests/ui/issues/issue-18804/auxiliary/lib.rs
@@ -0,0 +1,10 @@
+#![crate_type = "rlib"]
+#![feature(linkage)]
+
+pub fn foo<T>() -> *const () {
+    extern "C" {
+        #[linkage = "extern_weak"]
+        static FOO: *const ();
+    }
+    unsafe { FOO }
+}
diff --git a/tests/ui/issues/issue-18804/main.rs b/tests/ui/issues/issue-18804/main.rs
new file mode 100644
index 000000000..c36048ea5
--- /dev/null
+++ b/tests/ui/issues/issue-18804/main.rs
@@ -0,0 +1,19 @@
+// run-pass
+// Test for issue #18804, #[linkage] does not propagate through generic
+// functions. Failure results in a linker error.
+
+// ignore-asmjs no weak symbol support
+// ignore-emscripten no weak symbol support
+// ignore-windows no extern_weak linkage
+// ignore-macos no extern_weak linkage
+
+// aux-build:lib.rs
+
+// rust-lang/rust#56772: nikic says we need this to be proper test.
+// compile-flags: -C no-prepopulate-passes -C passes=name-anon-globals
+
+extern crate lib;
+
+fn main() {
+    lib::foo::<i32>();
+}