[gcc r15-8612] gccrs: Revert "gcc/rust/ChangeLog:"
Arthur Cohen
cohenarthur@gcc.gnu.org
Fri Mar 21 11:58:51 GMT 2025
https://gcc.gnu.org/g:29367fe699afe6a385e311b90f9c3850b19744ac
commit r15-8612-g29367fe699afe6a385e311b90f9c3850b19744ac
Author: CohenArthur <cohenarthur.dev@gmail.com>
Date: Fri Jan 10 15:26:39 2025 +0100
gccrs: Revert "gcc/rust/ChangeLog:"
This reverts commit 600fd806b8821ea24103ea0f31d666077245c6b7.
Diff:
---
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<AST::AttrInputLiteral &> (attr.get_attr_input ());
diff --git a/gcc/rust/util/rust-attributes.cc b/gcc/rust/util/rust-attributes.cc
index 0234903ba585..9f63234112c5 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 30f9eef213bc..c928c8eb9d26 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
More information about the Gcc-cvs
mailing list