From 44ec7404b9a1fb25512bcd262db7e8a1f8248f33 Mon Sep 17 00:00:00 2001 From: Arthur Cohen Date: Thu, 27 Jul 2023 10:06:37 +0200 Subject: [PATCH] gccrs: nr2.0: Add complex macro name resolution test cases gcc/testsuite/ChangeLog: * rust/compile/name_resolution6.rs: New test. * rust/compile/name_resolution7.rs: New test. * rust/compile/name_resolution8.rs: New test. * rust/compile/name_resolution9.rs: New test. --- .../rust/compile/name_resolution6.rs | 28 +++++++++++++++++++ .../rust/compile/name_resolution7.rs | 17 +++++++++++ .../rust/compile/name_resolution8.rs | 26 +++++++++++++++++ .../rust/compile/name_resolution9.rs | 17 +++++++++++ 4 files changed, 88 insertions(+) create mode 100644 gcc/testsuite/rust/compile/name_resolution6.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution7.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution8.rs create mode 100644 gcc/testsuite/rust/compile/name_resolution9.rs diff --git a/gcc/testsuite/rust/compile/name_resolution6.rs b/gcc/testsuite/rust/compile/name_resolution6.rs new file mode 100644 index 000000000000..e4087e6281ca --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution6.rs @@ -0,0 +1,28 @@ +// { dg-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" } + +pub mod foo { + pub mod bar { + pub mod baz { + pub mod qux { + #[macro_export] + macro_rules! foo { + (one) => {}; + } + + pub fn foo() {} + } + } + + fn f() { + fn inner() { + macro_rules! foo { + (two) => {}; + } + + foo!(two); // ok, textual scope + crate::foo!(one); // ok, path res + super::super::foo!(one); // ok, path res + } + } + } +} diff --git a/gcc/testsuite/rust/compile/name_resolution7.rs b/gcc/testsuite/rust/compile/name_resolution7.rs new file mode 100644 index 000000000000..fa84e2ffb839 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution7.rs @@ -0,0 +1,17 @@ +// { dg-options "-frust-name-resolution-2.0" } + +// check that macros by example do not get inserted in ribs like regular items +pub mod foo { + pub mod bar { + pub mod baz { + pub mod qux { + macro_rules! foo { + (one) => {}; + } + } + } + } +} + +crate::foo::bar::baz::qux::foo!(); // { dg-error "could not resolve macro invocation" } +foo::bar::baz::qux::foo!(); // { dg-error "could not resolve macro invocation" } diff --git a/gcc/testsuite/rust/compile/name_resolution8.rs b/gcc/testsuite/rust/compile/name_resolution8.rs new file mode 100644 index 000000000000..6fb517033824 --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution8.rs @@ -0,0 +1,26 @@ +// { dg-options "-frust-name-resolution-2.0" } + +// check that macros by example get exported to the crate's root with #[macro_export] +pub mod foo { + pub mod bar { + pub mod baz { + pub mod qux { + #[macro_export] + macro_rules! foo { + (one) => {}; + } + } + } + } +} + +crate::foo!(one); // ok +foo!(one); // ok + +mod a { + mod b { + mod c { + super::super::super::foo!(one); // ok + } + } +} diff --git a/gcc/testsuite/rust/compile/name_resolution9.rs b/gcc/testsuite/rust/compile/name_resolution9.rs new file mode 100644 index 000000000000..93adb46d278a --- /dev/null +++ b/gcc/testsuite/rust/compile/name_resolution9.rs @@ -0,0 +1,17 @@ +// { dg-options "-frust-name-resolution-2.0" } + +pub mod foo { + pub mod bar { + fn f() { + super::super::super::foo!(); // { dg-error "too many leading .super. keywords" } + // { dg-error "could not resolve macro invocation" "" { target *-*-* } .-1 } + + super::crate::foo!(); // { dg-error "leading path segment .crate. can only be used" } + // { dg-error "could not resolve macro invocation" "" { target *-*-* } .-1 } + + + crate::foo::bar::super::foo!(); // { dg-error "leading path segment .super. can only be used" } + // { dg-error "could not resolve macro invocation" "" { target *-*-* } .-1 } + } + } +} -- 2.47.2