Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/methods/method-macro-backtrace.rs b/tests/ui/methods/method-macro-backtrace.rs
new file mode 100644
index 000000000..00fe32b7c
--- /dev/null
+++ b/tests/ui/methods/method-macro-backtrace.rs
@@ -0,0 +1,25 @@
+// forbid-output: in this expansion of
+
+macro_rules! make_method {
+    ($name:ident) => ( fn $name(&self) { } )
+}
+
+struct S;
+
+impl S {
+    // We had a bug where these wouldn't clean up macro backtrace frames.
+    make_method!(foo1);
+    make_method!(foo2);
+    make_method!(foo3);
+    make_method!(foo4);
+    make_method!(foo5);
+    make_method!(foo6);
+    make_method!(foo7);
+    make_method!(foo8);
+
+    // Cause an error. It shouldn't have any macro backtrace frames.
+    fn bar(&self) { }
+    fn bar(&self) { } //~ ERROR duplicate definitions
+}
+
+fn main() { }