diff options
author | mxlol233 <mxlol233@outlook.com> | 2023-02-16 19:38:42 +0800 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:13:34 +0100 |
commit | a5258f3a11ab577835ef5e93be5cb65ec9e44132 (patch) | |
tree | d7d6d839ec282b14c6c1c2c58e24f4644405053f /gcc | |
parent | db4e496aadf1d7ab1c5af24410394d1551ddd3f0 (diff) | |
download | gcc-a5258f3a11ab577835ef5e93be5cb65ec9e44132.zip gcc-a5258f3a11ab577835ef5e93be5cb65ec9e44132.tar.gz gcc-a5258f3a11ab577835ef5e93be5cb65ec9e44132.tar.bz2 |
gccrs: Add feature gate for "rustc_attri".
This commit implemented a basic feature gate to check some attributes
for `rustc_attri`.
gcc/rust/ChangeLog:
* checks/errors/rust-feature-gate.cc: Add implementations
for `rustc_attri`.
* checks/errors/rust-feature-gate.h: Likewise.
gcc/testsuite/ChangeLog:
* rust/compile/builtin_macro_compile_error.rs: Add
crate feature `rustc_attri`.
* rust/compile/builtin_macro_concat.rs: Likewise.
* rust/compile/builtin_macro_eager1.rs: Likewise.
* rust/compile/builtin_macro_eager2.rs: Likewise.
* rust/compile/builtin_macro_env.rs: Likewise.
* rust/compile/builtin_macro_include_bytes.rs:
Likewise.
* rust/compile/builtin_macro_include_str.rs:
Likewise.
* rust/compile/builtin_macro_not_found.rs:
Likewise.
* rust/compile/builtin_macro_recurse2.rs:
Likewise.
* rust/compile/feature_rust_attri0.rs:New file.
* rust/compile/feature_rust_attri1.rs:New file.
* rust/compile/include_empty.rs:Add crate feature
`rustc_attri`.
* rust/compile/issue-1830_bytes.rs:Likewise.
* rust/compile/issue-1830_str.rs:Likewise.
* rust/compile/macro42.rs:Likewise.
* rust/execute/torture/builtin_macro_cfg.rs:
Likewise.
* rust/execute/torture/builtin_macro_concat.rs:
Likewise.
* rust/execute/torture/builtin_macro_env.rs:
Likewise.
* rust/execute/torture/builtin_macro_include_bytes.rs:
Likewise.
* rust/execute/torture/builtin_macro_include_str.rs:
Likewise.
* rust/execute/torture/builtin_macro_line.rs:
Likewise.
* rust/execute/torture/builtin_macros1.rs:
Likewise.
* rust/execute/torture/builtin_macros3.rs:
Likewise.
* rust/execute/torture/macros29.rs:Likewise.
* rust/execute/torture/macros30.rs:Likewise.
* rust/execute/torture/macros31.rs:Likewise.
Signed-off-by: Xiao Ma <mxlol233@outlook.com>
Diffstat (limited to 'gcc')
28 files changed, 127 insertions, 8 deletions
diff --git a/gcc/rust/checks/errors/rust-feature-gate.cc b/gcc/rust/checks/errors/rust-feature-gate.cc index e04b1c0..462f9b9 100644 --- a/gcc/rust/checks/errors/rust-feature-gate.cc +++ b/gcc/rust/checks/errors/rust-feature-gate.cc @@ -105,4 +105,54 @@ FeatureGate::visit (AST::ExternBlock &block) } } +void +FeatureGate::check_rustc_attri (const std::vector<AST::Attribute> &attributes) +{ + for (const AST::Attribute &attr : attributes) + { + auto name = attr.get_path ().as_string (); + if (name.rfind ("rustc_", 0) == 0) + { + gate (Feature::Name::RUSTC_ATTRS, attr.get_locus (), + "internal implementation detail"); + } + } +} + +void +FeatureGate::visit (AST::MacroRulesDefinition &rules_def) +{ + check_rustc_attri (rules_def.get_outer_attrs ()); +} + +void +FeatureGate::visit (AST::InherentImpl &impl) +{ + for (const auto &item : impl.get_impl_items ()) + { + item->accept_vis (*this); + } +} + +void +FeatureGate::visit (AST::TraitImpl &impl) +{ + for (const auto &item : impl.get_impl_items ()) + { + item->accept_vis (*this); + } +} + +void +FeatureGate::visit (AST::Method &method) +{ + check_rustc_attri (method.get_outer_attrs ()); +} + +void +FeatureGate::visit (AST::Function &function) +{ + check_rustc_attri (function.get_outer_attrs ()); +} + } // namespace Rust
\ No newline at end of file diff --git a/gcc/rust/checks/errors/rust-feature-gate.h b/gcc/rust/checks/errors/rust-feature-gate.h index b4b7900..5200155 100644 --- a/gcc/rust/checks/errors/rust-feature-gate.h +++ b/gcc/rust/checks/errors/rust-feature-gate.h @@ -25,8 +25,6 @@ namespace Rust { -struct Feature; - class FeatureGate : public AST::ASTVisitor { public: @@ -109,14 +107,14 @@ public: void visit (AST::TypeParam ¶m) override {} void visit (AST::LifetimeWhereClauseItem &item) override {} void visit (AST::TypeBoundWhereClauseItem &item) override {} - void visit (AST::Method &method) override {} + void visit (AST::Method &method) override; void visit (AST::Module &module) override {} void visit (AST::ExternCrate &crate) override {} void visit (AST::UseTreeGlob &use_tree) override {} void visit (AST::UseTreeList &use_tree) override {} void visit (AST::UseTreeRebind &use_tree) override {} void visit (AST::UseDeclaration &use_decl) override {} - void visit (AST::Function &function) override {} + void visit (AST::Function &function) override; void visit (AST::TypeAlias &type_alias) override {} void visit (AST::StructStruct &struct_item) override {} void visit (AST::TupleStruct &tuple_struct) override {} @@ -133,15 +131,15 @@ public: void visit (AST::TraitItemConst &item) override {} void visit (AST::TraitItemType &item) override {} void visit (AST::Trait &trait) override {} - void visit (AST::InherentImpl &impl) override {} - void visit (AST::TraitImpl &impl) override {} + void visit (AST::InherentImpl &impl) override; + void visit (AST::TraitImpl &impl) override; void visit (AST::ExternalStaticItem &item) override {} void visit (AST::ExternalFunctionItem &item) override {} void visit (AST::ExternBlock &block) override; void visit (AST::MacroMatchFragment &match) override {} void visit (AST::MacroMatchRepetition &match) override {} void visit (AST::MacroMatcher &matcher) override {} - void visit (AST::MacroRulesDefinition &rules_def) override {} + void visit (AST::MacroRulesDefinition &rules_def) override; void visit (AST::MacroInvocation ¯o_invoc) override {} void visit (AST::MetaItemPath &meta_item) override {} void visit (AST::MetaItemSeq &meta_item) override {} @@ -191,6 +189,7 @@ public: private: void gate (Feature::Name name, Location loc, const std::string &error_msg); + void check_rustc_attri (const std::vector<AST::Attribute> &attributes); std::set<Feature::Name> valid_features; }; } // namespace Rust diff --git a/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs b/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs index 9d22440..b08f67f 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! compile_error { () => {{}}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_concat.rs b/gcc/testsuite/rust/compile/builtin_macro_concat.rs index 3b8eb2d..28c8424 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_concat.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_concat.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! concat { () => {{}}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_eager1.rs b/gcc/testsuite/rust/compile/builtin_macro_eager1.rs index 0b516fd..65a80fd 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_eager1.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_eager1.rs @@ -1,4 +1,5 @@ // { dg-additional-options "-fdump-tree-gimple" } +#![feature(rustc_attrs)] #[rustc_builtin_macro] macro_rules! concat { diff --git a/gcc/testsuite/rust/compile/builtin_macro_eager2.rs b/gcc/testsuite/rust/compile/builtin_macro_eager2.rs index 21bf95c..70a92d5 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_eager2.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_eager2.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! env { () => {}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_env.rs b/gcc/testsuite/rust/compile/builtin_macro_env.rs index 337f0ae..83d3c2d 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_env.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_env.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! env { () => {{}}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs b/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs index 38716d3..9972c10 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include_bytes { () => {{}}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_str.rs b/gcc/testsuite/rust/compile/builtin_macro_include_str.rs index 8092193..d6d7a76 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_include_str.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_include_str.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include_str { () => {{}}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_not_found.rs b/gcc/testsuite/rust/compile/builtin_macro_not_found.rs index 1a3228b..5ba7fc0 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_not_found.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_not_found.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! crabby_crab_carb { // { dg-error "cannot find a built-in macro with name .crabby_crab_carb." } () => {{}}; diff --git a/gcc/testsuite/rust/compile/builtin_macro_recurse2.rs b/gcc/testsuite/rust/compile/builtin_macro_recurse2.rs index d859920..2e73ab5 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_recurse2.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_recurse2.rs @@ -1,4 +1,5 @@ // { dg-additional-options "-fdump-tree-gimple" } +#![feature(rustc_attrs)] #[rustc_builtin_macro] macro_rules! concat { diff --git a/gcc/testsuite/rust/compile/feature_rust_attri0.rs b/gcc/testsuite/rust/compile/feature_rust_attri0.rs new file mode 100644 index 0000000..9c11f56 --- /dev/null +++ b/gcc/testsuite/rust/compile/feature_rust_attri0.rs @@ -0,0 +1,11 @@ +#[rustc_builtin_macro] //{ dg-error "internal implementation detail. " "" { target *-*-* } } +macro_rules! line { + () => {{}}; +} + +fn main() -> i32 { + let a = line!(); + print(a); + + 0 +} diff --git a/gcc/testsuite/rust/compile/feature_rust_attri1.rs b/gcc/testsuite/rust/compile/feature_rust_attri1.rs new file mode 100644 index 0000000..ec4e7d5 --- /dev/null +++ b/gcc/testsuite/rust/compile/feature_rust_attri1.rs @@ -0,0 +1,13 @@ + +pub struct NotI8(i8); + +impl NotI8 { + #[rustc_inherit_overflow_checks] //{ dg-error "internal implementation detail" "" { target *-*-* } } + pub fn add(self, other: NotI8) -> NotI8 { + NotI8(self.0 + other.0) + } +} + +fn main() -> i32 { + 0 +} diff --git a/gcc/testsuite/rust/compile/include_empty.rs b/gcc/testsuite/rust/compile/include_empty.rs index 28e940f..02c2d2e 100644 --- a/gcc/testsuite/rust/compile/include_empty.rs +++ b/gcc/testsuite/rust/compile/include_empty.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include { () => {}; diff --git a/gcc/testsuite/rust/compile/issue-1830_bytes.rs b/gcc/testsuite/rust/compile/issue-1830_bytes.rs index 997d4ca..24b6933 100644 --- a/gcc/testsuite/rust/compile/issue-1830_bytes.rs +++ b/gcc/testsuite/rust/compile/issue-1830_bytes.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include_bytes { () => {{}}; diff --git a/gcc/testsuite/rust/compile/issue-1830_str.rs b/gcc/testsuite/rust/compile/issue-1830_str.rs index fcf2dc9..ce4a6a9 100644 --- a/gcc/testsuite/rust/compile/issue-1830_str.rs +++ b/gcc/testsuite/rust/compile/issue-1830_str.rs @@ -1,3 +1,5 @@ +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include_str { () => {{}}; diff --git a/gcc/testsuite/rust/compile/macro42.rs b/gcc/testsuite/rust/compile/macro42.rs index 52d150b..b3fbf6d 100644 --- a/gcc/testsuite/rust/compile/macro42.rs +++ b/gcc/testsuite/rust/compile/macro42.rs @@ -1,4 +1,6 @@ // { dg-additional-options "-w -frust-cfg=A" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! cfg { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs index a8d6ae0..92343e5 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs @@ -1,5 +1,7 @@ // { dg-additional-options "-w -frust-cfg=A" } // { dg-output "A\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! cfg { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs index a9d68e0..2470b75 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs @@ -1,4 +1,6 @@ // { dg-output "\r*\ntest10btrue2.15\r*\ntest10bfalse2.151\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! concat { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs index d64e2a0..5bad4de 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs @@ -1,5 +1,7 @@ // { dg-output "VALUE\r*\nVALUE\r*\n" } // { dg-set-compiler-env-var ENV_MACRO_TEST "VALUE" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! env { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs index 8be5577..19a1faf 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs @@ -1,4 +1,6 @@ // { dg-output "104\r*\n33\r*\n1\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include_bytes { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs index 43d40c9..a65639d 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs @@ -1,4 +1,6 @@ // { dg-output "hello, include!\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! include_str { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs index 9998de1..dd7dd4e 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs @@ -1,4 +1,6 @@ -// { dg-output "18\r*\n21\r*\n" } +// { dg-output "20\r*\n23\r*\n" } +#![feature(rustc_attrs)] + extern "C" { fn printf(fmt: *const i8, ...); } diff --git a/gcc/testsuite/rust/execute/torture/builtin_macros1.rs b/gcc/testsuite/rust/execute/torture/builtin_macros1.rs index 5bccb16..f5dcbd6 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macros1.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macros1.rs @@ -1,4 +1,6 @@ // { dg-output "rust/execute/torture/builtin_macros1.rs\r*" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! file { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/builtin_macros3.rs b/gcc/testsuite/rust/execute/torture/builtin_macros3.rs index 5a024fa..85a0c6d 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macros3.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macros3.rs @@ -1,4 +1,6 @@ // { dg-output "14\r*\n42\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! column { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/macros29.rs b/gcc/testsuite/rust/execute/torture/macros29.rs index 9c2cc0e..817ac67 100644 --- a/gcc/testsuite/rust/execute/torture/macros29.rs +++ b/gcc/testsuite/rust/execute/torture/macros29.rs @@ -1,4 +1,6 @@ // { dg-output "1\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! concat { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/macros30.rs b/gcc/testsuite/rust/execute/torture/macros30.rs index 7ec77d0..4dd0a55 100644 --- a/gcc/testsuite/rust/execute/torture/macros30.rs +++ b/gcc/testsuite/rust/execute/torture/macros30.rs @@ -1,4 +1,6 @@ // { dg-output "1\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! concat { () => {{}}; diff --git a/gcc/testsuite/rust/execute/torture/macros31.rs b/gcc/testsuite/rust/execute/torture/macros31.rs index 4c6378a..0a256c3 100644 --- a/gcc/testsuite/rust/execute/torture/macros31.rs +++ b/gcc/testsuite/rust/execute/torture/macros31.rs @@ -1,5 +1,7 @@ // { dg-additional-options "-w -frust-cfg=A" } // { dg-output "A\r*\nB\r*\n" } +#![feature(rustc_attrs)] + #[rustc_builtin_macro] macro_rules! cfg { () => {{}}; |