From 5b42f79ff088bf3f9136f6f668a481097e22bed9 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 16 Sep 2014 14:18:37 -0700 Subject: Pop the expansion context after expanding a method macro We were leaving these on the stack, causing spurious backtraces. I've confirmed that this test fails without the fix. --- src/test/compile-fail/method-macro-backtrace.rs | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/test/compile-fail/method-macro-backtrace.rs (limited to 'src/test') diff --git a/src/test/compile-fail/method-macro-backtrace.rs b/src/test/compile-fail/method-macro-backtrace.rs new file mode 100644 index 00000000000..dc41e2e02a8 --- /dev/null +++ b/src/test/compile-fail/method-macro-backtrace.rs @@ -0,0 +1,37 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// forbid-output: in expansion of + +#![feature(macro_rules)] + +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 definition +} + +fn main() { } -- cgit 1.4.1-3-g733a5