diff options
| author | jjasmine <tanghocle456@gmail.com> | 2024-02-23 13:06:14 -0800 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-02-27 11:57:50 +0000 |
| commit | 75424e6ccb57f69987a329e8df68f751af4bcc25 (patch) | |
| tree | fcb08e0180cda6992cc214750edcb1b51177f976 | |
| parent | 4ef924f7616122a33a2a563da76a6a1a99602dd9 (diff) | |
| download | gcc-75424e6ccb57f69987a329e8df68f751af4bcc25.zip gcc-75424e6ccb57f69987a329e8df68f751af4bcc25.tar.gz gcc-75424e6ccb57f69987a329e8df68f751af4bcc25.tar.bz2 | |
Fix small FixMe task in rust macro builtins
gcc/rust/ChangeLog:
* expand/rust-macro-builtins.cc: Change BuiltinMacro in
builtin_macro_from_string to tl::optional<>
* expand/rust-macro-builtins.h (enum class): Change BuiltinMacro
in builtin_macro_from_string to tl::optional<>
* resolve/rust-early-name-resolver.cc (EarlyNameResolver::visit):
Resolved wrong type dependency of builtin_macro_from_string
Signed-off-by: jjasmine <tanghocle456@gmail.com>
| -rw-r--r-- | gcc/rust/expand/rust-macro-builtins.cc | 3 | ||||
| -rw-r--r-- | gcc/rust/expand/rust-macro-builtins.h | 2 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-early-name-resolver.cc | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index 2af05a5..f103759a 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -126,8 +126,7 @@ std::unordered_map<std::string, AST::MacroTranscriberFunc> {"Hash", MacroBuiltin::proc_macro_builtin}, }; -// FIXME: This should return an tl::optional -BuiltinMacro +tl::optional<BuiltinMacro> builtin_macro_from_string (const std::string &identifier) { auto macro = MacroBuiltin::builtins.lookup (identifier); diff --git a/gcc/rust/expand/rust-macro-builtins.h b/gcc/rust/expand/rust-macro-builtins.h index f9ab3fc..1d6b30b 100644 --- a/gcc/rust/expand/rust-macro-builtins.h +++ b/gcc/rust/expand/rust-macro-builtins.h @@ -75,7 +75,7 @@ enum class BuiltinMacro Hash, }; -BuiltinMacro +tl::optional<BuiltinMacro> builtin_macro_from_string (const std::string &identifier); /** diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc b/gcc/rust/resolve/rust-early-name-resolver.cc index 422dd92..d70f9ca 100644 --- a/gcc/rust/resolve/rust-early-name-resolver.cc +++ b/gcc/rust/resolve/rust-early-name-resolver.cc @@ -497,7 +497,7 @@ EarlyNameResolver::visit (AST::MacroInvocation &invoc) { auto builtin_kind = builtin_macro_from_string (rules_def->get_rule_name ().as_string ()); - invoc.map_to_builtin (builtin_kind); + invoc.map_to_builtin (builtin_kind.value ()); } auto attributes = rules_def->get_outer_attrs (); |