From: jjasmine <[email protected]>
Rename InlineAsmOptions to InlineAsmOption for clarity
gcc/rust/ChangeLog:
* ast/rust-ast-full-decls.h (enum class):
Rename InlineAsmOptions to InlineAsmOption for clarity
* ast/rust-expr.h (enum class): Likewise.
* expand/rust-macro-builtins-asm.cc (check_and_set): Likewise.
(parse_options): Likewise.
* expand/rust-macro-builtins-asm.h (check_and_set): Likewise.
* hir/tree/rust-hir-expr.h: Likewise.
---
gcc/rust/ast/rust-ast-full-decls.h | 2 +-
gcc/rust/ast/rust-expr.h | 5 ++-
gcc/rust/expand/rust-macro-builtins-asm.cc | 42 +++++++++++-----------
gcc/rust/expand/rust-macro-builtins-asm.h | 2 +-
gcc/rust/hir/tree/rust-hir-expr.h | 2 +-
5 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/gcc/rust/ast/rust-ast-full-decls.h
b/gcc/rust/ast/rust-ast-full-decls.h
index 26377b790d4..d2ba87613e6 100644
--- a/gcc/rust/ast/rust-ast-full-decls.h
+++ b/gcc/rust/ast/rust-ast-full-decls.h
@@ -145,7 +145,7 @@ struct MatchCase;
class MatchExpr;
class AwaitExpr;
class AsyncBlockExpr;
-enum class InlineAsmOptions;
+enum class InlineAsmOption;
struct AnonConst;
struct InlineAsmRegOrRegClass;
struct InlineAsmOperand;
diff --git a/gcc/rust/ast/rust-expr.h b/gcc/rust/ast/rust-expr.h
index 309174057c0..bceef827dfb 100644
--- a/gcc/rust/ast/rust-expr.h
+++ b/gcc/rust/ast/rust-expr.h
@@ -4706,7 +4706,7 @@ protected:
};
// Inline-assembly specific options
-enum class InlineAsmOptions
+enum class InlineAsmOption
{
PURE = 1 << 0,
NOMEM = 1 << 1,
@@ -4848,8 +4848,7 @@ public:
std::vector<TupleTemplateStr> template_strs;
std::vector<InlineAsmOperand> operands;
std::vector<TupleClobber> clobber_abi;
- // std::set<InlineAsmOptions> options;
- std::set<InlineAsmOptions> options;
+ std::set<InlineAsmOption> options;
std::vector<location_t> line_spans;
diff --git a/gcc/rust/expand/rust-macro-builtins-asm.cc
b/gcc/rust/expand/rust-macro-builtins-asm.cc
index f6940ffb339..1bfc6e9f456 100644
--- a/gcc/rust/expand/rust-macro-builtins-asm.cc
+++ b/gcc/rust/expand/rust-macro-builtins-asm.cc
@@ -19,16 +19,16 @@
#include "rust-macro-builtins-asm.h"
namespace Rust {
-std::map<AST::InlineAsmOptions, std::string> InlineAsmOptionsMap{
- {AST::InlineAsmOptions::PURE, "pure"},
- {AST::InlineAsmOptions::NOMEM, "nomem"},
- {AST::InlineAsmOptions::READONLY, "readonly"},
- {AST::InlineAsmOptions::PRESERVES_FLAGS, "preserves_flags"},
- {AST::InlineAsmOptions::NORETURN, "noreturn"},
- {AST::InlineAsmOptions::NOSTACK, "nostack"},
- {AST::InlineAsmOptions::MAY_UNWIND, "may_unwind"},
- {AST::InlineAsmOptions::ATT_SYNTAX, "att_syntax"},
- {AST::InlineAsmOptions::RAW, "raw"},
+std::map<AST::InlineAsmOption, std::string> InlineAsmOptionMap{
+ {AST::InlineAsmOption::PURE, "pure"},
+ {AST::InlineAsmOption::NOMEM, "nomem"},
+ {AST::InlineAsmOption::READONLY, "readonly"},
+ {AST::InlineAsmOption::PRESERVES_FLAGS, "preserves_flags"},
+ {AST::InlineAsmOption::NORETURN, "noreturn"},
+ {AST::InlineAsmOption::NOSTACK, "nostack"},
+ {AST::InlineAsmOption::MAY_UNWIND, "may_unwind"},
+ {AST::InlineAsmOption::ATT_SYNTAX, "att_syntax"},
+ {AST::InlineAsmOption::RAW, "raw"},
};
int
@@ -174,14 +174,14 @@ parse_operand (Parser<MacroInvocLexer> &parser, TokenId
last_token_id,
void
check_and_set (Parser<MacroInvocLexer> &parser, AST::InlineAsm &inlineAsm,
- AST::InlineAsmOptions option)
+ AST::InlineAsmOption option)
{
if (inlineAsm.options.count (option) != 0)
{
// TODO: report an error of duplication
rust_error_at (parser.peek_current_token ()->get_locus (),
"the `%s` option was already provided",
- InlineAsmOptionsMap[option].c_str ());
+ InlineAsmOptionMap[option].c_str ());
return;
}
else
@@ -208,40 +208,40 @@ parse_options (Parser<MacroInvocLexer> &parser, TokenId
last_token_id,
{
if (!is_global_asm && check_identifier (parser, "pure"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::PURE);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::PURE);
}
else if (!is_global_asm && check_identifier (parser, "nomem"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::NOMEM);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::NOMEM);
}
else if (!is_global_asm && check_identifier (parser, "readonly"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::READONLY);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::READONLY);
}
else if (!is_global_asm && check_identifier (parser, "preserves_flags"))
{
check_and_set (parser, inlineAsm,
- AST::InlineAsmOptions::PRESERVES_FLAGS);
+ AST::InlineAsmOption::PRESERVES_FLAGS);
}
else if (!is_global_asm && check_identifier (parser, "noreturn"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::NORETURN);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::NORETURN);
}
else if (!is_global_asm && check_identifier (parser, "nostack"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::NOSTACK);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::NOSTACK);
}
else if (!is_global_asm && check_identifier (parser, "may_unwind"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::MAY_UNWIND);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::MAY_UNWIND);
}
else if (check_identifier (parser, "att_syntax"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::ATT_SYNTAX);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::ATT_SYNTAX);
}
else if (check_identifier (parser, "raw"))
{
- check_and_set (parser, inlineAsm, AST::InlineAsmOptions::RAW);
+ check_and_set (parser, inlineAsm, AST::InlineAsmOption::RAW);
}
else
{
diff --git a/gcc/rust/expand/rust-macro-builtins-asm.h
b/gcc/rust/expand/rust-macro-builtins-asm.h
index 469dc5ae906..ffb438bcb89 100644
--- a/gcc/rust/expand/rust-macro-builtins-asm.h
+++ b/gcc/rust/expand/rust-macro-builtins-asm.h
@@ -24,7 +24,7 @@ check_identifier (Parser<MacroInvocLexer> &p, std::string
ident);
void
check_and_set (Parser<MacroInvocLexer> &p, AST::InlineAsm &inlineAsm,
- AST::InlineAsmOptions option);
+ AST::InlineAsmOption option);
// From rustc
int
parse_operand (Parser<MacroInvocLexer> &parser, TokenId last_token_id,
diff --git a/gcc/rust/hir/tree/rust-hir-expr.h
b/gcc/rust/hir/tree/rust-hir-expr.h
index 11b1c4c295f..686c7311a4b 100644
--- a/gcc/rust/hir/tree/rust-hir-expr.h
+++ b/gcc/rust/hir/tree/rust-hir-expr.h
@@ -3870,7 +3870,7 @@ public:
std::vector<AST::InlineAsmTemplatePiece> template_;
std::vector<AST::TupleTemplateStr> template_strs;
std::vector<AST::InlineAsmOperand> operands;
- AST::InlineAsmOptions options;
+ AST::InlineAsmOption options;
std::vector<location_t> line_spans;
};
} // namespace HIR
--
2.45.2
