diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/expand/rust-attribute-visitor.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/expand/rust-macro-expand.h | 3 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/macro-issue1233.rs | 22 |
3 files changed, 25 insertions, 2 deletions
diff --git a/gcc/rust/expand/rust-attribute-visitor.cc b/gcc/rust/expand/rust-attribute-visitor.cc index 771f034..c7c6867 100644 --- a/gcc/rust/expand/rust-attribute-visitor.cc +++ b/gcc/rust/expand/rust-attribute-visitor.cc @@ -1193,7 +1193,6 @@ AttrVisitor::visit (AST::BlockExpr &expr) if (expander.fails_cfg_with_expand (expr.get_outer_attrs ())) { expr.mark_for_strip (); - expander.pop_context (); return; } @@ -1203,7 +1202,6 @@ AttrVisitor::visit (AST::BlockExpr &expr) if (expander.fails_cfg_with_expand (expr.get_inner_attrs ())) { expr.mark_for_strip (); - expander.pop_context (); return; } diff --git a/gcc/rust/expand/rust-macro-expand.h b/gcc/rust/expand/rust-macro-expand.h index 3c53d8d..a582524 100644 --- a/gcc/rust/expand/rust-macro-expand.h +++ b/gcc/rust/expand/rust-macro-expand.h @@ -275,8 +275,11 @@ struct MacroExpander ContextType pop_context () { + rust_assert (!context.empty ()); + ContextType t = context.back (); context.pop_back (); + return t; } diff --git a/gcc/testsuite/rust/compile/macro-issue1233.rs b/gcc/testsuite/rust/compile/macro-issue1233.rs new file mode 100644 index 0000000..d762bb7 --- /dev/null +++ b/gcc/testsuite/rust/compile/macro-issue1233.rs @@ -0,0 +1,22 @@ +// { dg-additional-options "-w" } + +macro_rules! impl_uint { + ($($ty:ident = $lang:literal),*) => { + $( + impl $ty { + pub fn to_le(self) -> Self { + #[cfg(not(target_endian = "little"))] + { + self + } + #[cfg(target_endian = "little")] + { + self + } + } + } + )* + } +} + +impl_uint!(u8 = "u8", u16 = "u16", u32 = "u32"); |