From 2b9a3ff15e968151954e63fba5f22d6e64e850f2 Mon Sep 17 00:00:00 2001 From: CohenArthur Date: Fri, 10 Jan 2025 15:26:39 +0100 Subject: [PATCH] Revert "gcc/rust/ChangeLog:" This reverts commit 600fd806b8821ea24103ea0f31d666077245c6b7. --- gcc/rust/ast/rust-collect-lang-items.cc | 7 ++++++- gcc/rust/util/rust-attributes.cc | 8 -------- gcc/rust/util/rust-attributes.h | 2 -- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/gcc/rust/ast/rust-collect-lang-items.cc b/gcc/rust/ast/rust-collect-lang-items.cc index ec6919dca14e..50d134a429f5 100644 --- a/gcc/rust/ast/rust-collect-lang-items.cc +++ b/gcc/rust/ast/rust-collect-lang-items.cc @@ -40,7 +40,12 @@ get_lang_item_attr (const T &maybe_lang_item) continue; } - if (Analysis::Attributes::is_lang_item (str_path, attr)) + bool is_lang_item = str_path == Values::Attributes::LANG + && attr.has_attr_input () + && attr.get_attr_input ().get_attr_input_type () + == AST::AttrInput::AttrInputType::LITERAL; + + if (is_lang_item) { auto &literal = static_cast (attr.get_attr_input ()); diff --git a/gcc/rust/util/rust-attributes.cc b/gcc/rust/util/rust-attributes.cc index 1a66be25ccfb..45ebf8c65461 100644 --- a/gcc/rust/util/rust-attributes.cc +++ b/gcc/rust/util/rust-attributes.cc @@ -37,14 +37,6 @@ Attributes::is_known (const std::string &attribute_path) return !lookup.is_error (); } -bool -Attributes::is_lang_item (const std::string &attribute_path, - const AST::Attribute &attr) -{ - return ((attribute_path == Values::Attributes::LANG) && attr.has_attr_input () - && (attr.get_attr_input ().get_attr_input_type () - == AST::AttrInput::AttrInputType::LITERAL)); -} using Attrs = Values::Attributes; diff --git a/gcc/rust/util/rust-attributes.h b/gcc/rust/util/rust-attributes.h index c0d1bed64455..c341b3e0a5db 100644 --- a/gcc/rust/util/rust-attributes.h +++ b/gcc/rust/util/rust-attributes.h @@ -29,8 +29,6 @@ class Attributes { public: static bool is_known (const std::string &attribute_path); - static bool is_lang_item (const std::string &attribute_path, - const AST::Attribute &attr); }; enum CompilerPass