Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/ui/fn/nested-function-names-issue-8587.rs b/tests/ui/fn/nested-function-names-issue-8587.rs
new file mode 100644
index 000000000..8fafd41d9
--- /dev/null
+++ b/tests/ui/fn/nested-function-names-issue-8587.rs
@@ -0,0 +1,42 @@
+// run-pass
+// Make sure nested functions are separate, even if they have
+// equal name.
+//
+// Issue #8587
+
+
+pub struct X;
+
+impl X {
+    fn f(&self) -> isize {
+        #[inline(never)]
+        fn inner() -> isize {
+            0
+        }
+        inner()
+    }
+
+    fn g(&self) -> isize {
+        #[inline(never)]
+        fn inner_2() -> isize {
+            1
+        }
+        inner_2()
+    }
+
+    fn h(&self) -> isize {
+        #[inline(never)]
+        fn inner() -> isize {
+            2
+        }
+        inner()
+    }
+}
+
+pub fn main() {
+    let n = X;
+    assert_eq!(n.f(), 0);
+    assert_eq!(n.g(), 1);
+    // This test `h` used to fail.
+    assert_eq!(n.h(), 2);
+}