expand: Keep track of semicoloned builtin macros

This is quite a rough fix (like a lot of the macro expansion code...) but
it allows built-in macros to be treated as statements. I *think* asm!()
might be the only one where it really matters, but also doing something
like

{
    line!();
}

will now work, whereas before the macro invocation would not get expanded
properly and would be ignored.

gcc/rust/ChangeLog:

	* ast/rust-ast-fragment.h: Pass `is_semicolon` information to builtin
	macro transcribers.
	* ast/rust-macro.h: Pass semicolon information to transcriber..
	* expand/rust-macro-builtins-asm.cc (MacroBuiltin::asm_handler): Likewise.
	(parse_asm): Likewise.
	* expand/rust-macro-builtins-asm.h (parse_asm): Likewise.
	* expand/rust-macro-builtins-format-args.cc (MacroBuiltin::format_args_handler): Likewise.
	* expand/rust-macro-builtins-include.cc (MacroBuiltin::include_bytes_handler): Likewise.
	(MacroBuiltin::include_str_handler): Likewise.
	(MacroBuiltin::include_handler): Likewise.
	* expand/rust-macro-builtins-location.cc (MacroBuiltin::file_handler): Likewise.
	(MacroBuiltin::column_handler): Likewise.
	(MacroBuiltin::line_handler): Likewise.
	* expand/rust-macro-builtins-log-debug.cc (MacroBuiltin::assert_handler): Likewise.
	* expand/rust-macro-builtins-utility.cc (MacroBuiltin::compile_error_handler): Likewise.
	(MacroBuiltin::concat_handler): Likewise.
	(MacroBuiltin::env_handler): Likewise.
	(MacroBuiltin::cfg_handler): Likewise.
	(MacroBuiltin::stringify_handler): Likewise.
	* expand/rust-macro-builtins.cc (format_args_maker): Likewise.
	(inline_asm_maker): Likewise.
	(MacroBuiltin::sorry): Likewise.
	(MacroBuiltin::proc_macro_builtin): Likewise.
	* expand/rust-macro-builtins.h: Likewise.
	* expand/rust-macro-expand.cc (MacroExpander::expand_decl_macro): Likewise.
	(MacroExpander::expand_invoc): Likewise.
	* ast/rust-ast-visitor.cc (DefaultASTVisitor::visit): Remove rust_unreachable.
	* ast/rust-ast.cc (InlineAsm::accept_vis): Likewise.
	* hir/tree/rust-hir.cc (InlineAsm::accept_vis): Likewise.

diff --git a/gcc/rust/ast/rust-ast-fragment.h b/gcc/rust/ast/rust-ast-fragment.h
index 33603ac5a4e588ba6e475f4cfe7fa9be1cd02782..0c4204f71fab0b452fc2a4b79734dcaca2eda947 100644 (file)
--- a/gcc/rust/ast/rust-ast-fragment.h
+++ b/gcc/rust/ast/rust-ast-fragment.h
@@ -128,7 +128,8 @@ private:
  * rust-macro-builtins.{h,cc}.
  */
 using MacroTranscriberFunc
-  = std::function<tl::optional<Fragment> (location_t, MacroInvocData &)>;
+  = std::function<tl::optional<Fragment> (location_t, MacroInvocData &,
+                                         bool semicolon)>;
 
 } // namespace AST
 } // namespace Rust

diff --git a/gcc/rust/ast/rust-ast-visitor.cc b/gcc/rust/ast/rust-ast-visitor.cc
index c645ade4772bb7d493015899b37196dd8eed9606..fc31b0ae5d43f90eff880d0ef91834cb8182dac4 100644 (file)
--- a/gcc/rust/ast/rust-ast-visitor.cc
+++ b/gcc/rust/ast/rust-ast-visitor.cc
@@ -664,9 +664,7 @@ DefaultASTVisitor::visit (AST::AsyncBlockExpr &expr)
 
 void
 DefaultASTVisitor::visit (AST::InlineAsm &expr)
-{
-  rust_unreachable ();
-}
+{}
 
 void
 DefaultASTVisitor::visit (AST::TypeParam &param)

diff --git a/gcc/rust/ast/rust-ast.cc b/gcc/rust/ast/rust-ast.cc
index d94b7118d5e2aca3242e9d4552d2fafa83bee910..2a173c4610df15efacd2b29818f9046f86450067 100644 (file)
--- a/gcc/rust/ast/rust-ast.cc
+++ b/gcc/rust/ast/rust-ast.cc
@@ -4659,7 +4659,6 @@ AsyncBlockExpr::accept_vis (ASTVisitor &vis)
 void
 InlineAsm::accept_vis (ASTVisitor &vis)
 {
-  rust_unreachable ();
   vis.visit (*this);
 }
 

diff --git a/gcc/rust/ast/rust-macro.h b/gcc/rust/ast/rust-macro.h
index 5300b59f5d3a93ceb5455c8008420c0d652b9dbb..69b59c25d084153ce213cea354042f844b5c6f41 100644 (file)
--- a/gcc/rust/ast/rust-macro.h
+++ b/gcc/rust/ast/rust-macro.h
@@ -482,7 +482,7 @@ private:
    * should make use of the actual rules. If the macro is builtin, then another
    * associated transcriber should be used
    */
-  static Fragment dummy_builtin (location_t, MacroInvocData &)
+  static Fragment dummy_builtin (location_t, MacroInvocData &, bool)
   {
     rust_unreachable ();
     return Fragment::create_error ();

diff --git a/gcc/rust/expand/rust-macro-builtins-asm.cc b/gcc/rust/expand/rust-macro-builtins-asm.cc
index b7a53898306a3f4eee6a6eec209444a43de0efe5..473070bd34378474e25534cdf5d5a30f9f3dafa5 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-asm.cc
+++ b/gcc/rust/expand/rust-macro-builtins-asm.cc
@@ -17,6 +17,8 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-macro-builtins-asm.h"
+#include "rust-ast.h"
+#include "rust-stmt.h"
 
 namespace Rust {
 std::map<AST::InlineAsmOption, std::string> InlineAsmOptionMap{
@@ -535,9 +537,9 @@ parse_format_string (InlineAsmContext &inline_asm_ctx)
 
 tl::optional<AST::Fragment>
 MacroBuiltin::asm_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
-                          bool is_global_asm)
+                          bool semicolon, bool is_global_asm)
 {
-  return parse_asm (invoc_locus, invoc, is_global_asm);
+  return parse_asm (invoc_locus, invoc, is_global_asm, semicolon);
 }
 
 tl::expected<InlineAsmContext, std::string>
@@ -607,7 +609,7 @@ parse_asm_arg (InlineAsmContext inline_asm_ctx)
 
 tl::optional<AST::Fragment>
 parse_asm (location_t invoc_locus, AST::MacroInvocData &invoc,
-          bool is_global_asm)
+          bool is_global_asm, bool semicolon)
 {
   // From the rule of asm.
   // We first peek and see if it is a format string or not.
@@ -646,9 +648,18 @@ parse_asm (location_t invoc_locus, AST::MacroInvocData &invoc,
 
   if (is_valid)
     {
-      AST::SingleASTNode single = AST::SingleASTNode (
-       inline_asm_ctx.inline_asm.clone_expr_without_block ());
-      std::vector<AST::SingleASTNode> single_vec = {single};
+      auto node = inline_asm_ctx.inline_asm.clone_expr_without_block ();
+
+      std::vector<AST::SingleASTNode> single_vec = {};
+
+      // If the macro invocation has a semicolon (`asm!("...");`), then we need
+      // to make it a statement. This way, it will be expanded properly.
+      if (semicolon)
+       single_vec.emplace_back (
+         AST::SingleASTNode (std::unique_ptr<AST::Stmt> (
+           new AST::ExprStmt (std::move (node), invoc_locus, semicolon))));
+      else
+       single_vec.emplace_back (AST::SingleASTNode (std::move (node)));
 
       AST::Fragment fragment_ast
        = AST::Fragment (single_vec,

diff --git a/gcc/rust/expand/rust-macro-builtins-asm.h b/gcc/rust/expand/rust-macro-builtins-asm.h
index 639dcabc072f408e0a51e50dcc1e1eed9b8f194a..b290ebce4586cd4f5b61db4015c2dc18c4c38dea 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-asm.h
+++ b/gcc/rust/expand/rust-macro-builtins-asm.h
@@ -59,7 +59,7 @@ parse_reg_operand (InlineAsmContext inline_asm_ctx);
 
 tl::optional<AST::Fragment>
 parse_asm (location_t invoc_locus, AST::MacroInvocData &invoc,
-          bool is_global_asm);
+          bool is_global_asm, bool semicolon);
 
 bool
 check_identifier (Parser<MacroInvocLexer> &parser, std::string ident);

diff --git a/gcc/rust/expand/rust-macro-builtins-format-args.cc b/gcc/rust/expand/rust-macro-builtins-format-args.cc
index f42a07ff205dfd3f3b25cd17d4481b0300431117..d0daa77c67aaab62e52621807cc5a70562b64968 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-format-args.cc
+++ b/gcc/rust/expand/rust-macro-builtins-format-args.cc
@@ -115,7 +115,7 @@ format_args_parse_arguments (AST::MacroInvocData &invoc)
 
 tl::optional<AST::Fragment>
 MacroBuiltin::format_args_handler (location_t invoc_locus,
-                                  AST::MacroInvocData &invoc,
+                                  AST::MacroInvocData &invoc, bool semicolon,
                                   AST::FormatArgs::Newline nl)
 {
   auto input = format_args_parse_arguments (invoc);

diff --git a/gcc/rust/expand/rust-macro-builtins-include.cc b/gcc/rust/expand/rust-macro-builtins-include.cc
index 18c8f42325e9dc453ad6adc68ff73e36a034c6e0..291eae80210e261a278b559577d626834e4144dd 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-include.cc
+++ b/gcc/rust/expand/rust-macro-builtins-include.cc
@@ -27,7 +27,7 @@ of the given file as reference to a byte array. Yields an expression of type
 
 tl::optional<AST::Fragment>
 MacroBuiltin::include_bytes_handler (location_t invoc_locus,
-                                    AST::MacroInvocData &invoc)
+                                    AST::MacroInvocData &invoc, bool semicolon)
 {
   /* Get target filename from the macro invocation, which is treated as a path
      relative to the include!-ing file (currently being compiled).  */
@@ -93,7 +93,7 @@ MacroBuiltin::include_bytes_handler (location_t invoc_locus,
 
 tl::optional<AST::Fragment>
 MacroBuiltin::include_str_handler (location_t invoc_locus,
-                                  AST::MacroInvocData &invoc)
+                                  AST::MacroInvocData &invoc, bool semicolon)
 {
   /* Get target filename from the macro invocation, which is treated as a path
      relative to the include!-ing file (currently being compiled).  */
@@ -182,7 +182,7 @@ scope compile time. */
 
 tl::optional<AST::Fragment>
 MacroBuiltin::include_handler (location_t invoc_locus,
-                              AST::MacroInvocData &invoc)
+                              AST::MacroInvocData &invoc, bool semicolon)
 {
   /* Get target filename from the macro invocation, which is treated as a path
      relative to the include!-ing file (currently being compiled).  */

diff --git a/gcc/rust/expand/rust-macro-builtins-location.cc b/gcc/rust/expand/rust-macro-builtins-location.cc
index 19857487c0bc6e8a7eac59c4a737ec2b740485fd..0d19be6c720fcbb97465f96d2eddbaec01c4b466 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-location.cc
+++ b/gcc/rust/expand/rust-macro-builtins-location.cc
@@ -21,7 +21,7 @@
 
 namespace Rust {
 tl::optional<AST::Fragment>
-MacroBuiltin::file_handler (location_t invoc_locus, AST::MacroInvocData &)
+MacroBuiltin::file_handler (location_t invoc_locus, AST::MacroInvocData &, bool)
 {
   auto current_file = LOCATION_FILE (invoc_locus);
   auto file_str = AST::SingleASTNode (make_string (invoc_locus, current_file));
@@ -32,7 +32,8 @@ MacroBuiltin::file_handler (location_t invoc_locus, AST::MacroInvocData &)
 }
 
 tl::optional<AST::Fragment>
-MacroBuiltin::column_handler (location_t invoc_locus, AST::MacroInvocData &)
+MacroBuiltin::column_handler (location_t invoc_locus, AST::MacroInvocData &,
+                             bool)
 {
   auto current_column = LOCATION_COLUMN (invoc_locus);
 
@@ -46,7 +47,7 @@ MacroBuiltin::column_handler (location_t invoc_locus, AST::MacroInvocData &)
 }
 
 tl::optional<AST::Fragment>
-MacroBuiltin::line_handler (location_t invoc_locus, AST::MacroInvocData &)
+MacroBuiltin::line_handler (location_t invoc_locus, AST::MacroInvocData &, bool)
 {
   auto current_line = LOCATION_LINE (invoc_locus);
 

diff --git a/gcc/rust/expand/rust-macro-builtins-log-debug.cc b/gcc/rust/expand/rust-macro-builtins-log-debug.cc
index 56bd3034b08adc017a37c8f0bfaed92be9fdc0cd..3bebf543c8678f6e5b4235a67f9301801f0ebdd7 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-log-debug.cc
+++ b/gcc/rust/expand/rust-macro-builtins-log-debug.cc
@@ -22,7 +22,7 @@
 namespace Rust {
 tl::optional<AST::Fragment>
 MacroBuiltin::assert_handler (location_t invoc_locus,
-                             AST::MacroInvocData &invoc)
+                             AST::MacroInvocData &invoc, bool semicolon)
 {
   rust_debug ("assert!() called");
 

diff --git a/gcc/rust/expand/rust-macro-builtins-utility.cc b/gcc/rust/expand/rust-macro-builtins-utility.cc
index c5932b3d9784b2233b7fa589d0fb68c24c90019d..75b8fb2fac5330dda6f0394535dbb5da5e8fd379 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins-utility.cc
+++ b/gcc/rust/expand/rust-macro-builtins-utility.cc
@@ -26,7 +26,7 @@ namespace Rust {
    during the compile time. */
 tl::optional<AST::Fragment>
 MacroBuiltin::compile_error_handler (location_t invoc_locus,
-                                    AST::MacroInvocData &invoc)
+                                    AST::MacroInvocData &invoc, bool semicolon)
 {
   auto lit_expr
     = parse_single_string_literal (BuiltinMacro::CompileError,
@@ -87,7 +87,7 @@ MacroBuiltin::compile_error_handler (location_t invoc_locus,
 // Can we do that easily?
 tl::optional<AST::Fragment>
 MacroBuiltin::concat_handler (location_t invoc_locus,
-                             AST::MacroInvocData &invoc)
+                             AST::MacroInvocData &invoc, bool semicolon)
 {
   auto invoc_token_tree = invoc.get_delim_tok_tree ();
   MacroInvocLexer lex (invoc_token_tree.to_token_stream ());
@@ -151,7 +151,8 @@ MacroBuiltin::concat_handler (location_t invoc_locus,
 /* Expand builtin macro env!(), which inspects an environment variable at
    compile time. */
 tl::optional<AST::Fragment>
-MacroBuiltin::env_handler (location_t invoc_locus, AST::MacroInvocData &invoc)
+MacroBuiltin::env_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                          bool semicolon)
 {
   auto invoc_token_tree = invoc.get_delim_tok_tree ();
   MacroInvocLexer lex (invoc_token_tree.to_token_stream ());
@@ -224,7 +225,8 @@ MacroBuiltin::env_handler (location_t invoc_locus, AST::MacroInvocData &invoc)
 }
 
 tl::optional<AST::Fragment>
-MacroBuiltin::cfg_handler (location_t invoc_locus, AST::MacroInvocData &invoc)
+MacroBuiltin::cfg_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                          bool semicolon)
 {
   // only parse if not already parsed
   if (!invoc.is_parsed ())
@@ -263,7 +265,7 @@ MacroBuiltin::cfg_handler (location_t invoc_locus, AST::MacroInvocData &invoc)
 
 tl::optional<AST::Fragment>
 MacroBuiltin::stringify_handler (location_t invoc_locus,
-                                AST::MacroInvocData &invoc)
+                                AST::MacroInvocData &invoc, bool semicolon)
 {
   std::string content;
   auto invoc_token_tree = invoc.get_delim_tok_tree ();

diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc
index a6a337003ab85a0e851b4164047118cdcefff93f..567f4db30fc76932534b267b56020f45fe316a17 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins.cc
+++ b/gcc/rust/expand/rust-macro-builtins.cc
@@ -87,8 +87,8 @@ const BiMap<std::string, BuiltinMacro> MacroBuiltin::builtins = {{
 AST::MacroTranscriberFunc
 format_args_maker (AST::FormatArgs::Newline nl)
 {
-  return [nl] (location_t loc, AST::MacroInvocData &invoc) {
-    return MacroBuiltin::format_args_handler (loc, invoc, nl);
+  return [nl] (location_t loc, AST::MacroInvocData &invoc, bool semicolon) {
+    return MacroBuiltin::format_args_handler (loc, invoc, semicolon, nl);
   };
 }
 
@@ -103,9 +103,10 @@ inline_asm_maker (isGlobalAsm is_global_asm)
 {
   bool global_asm = is_global_asm == isGlobalAsm::Global ? true : false;
 
-  return [global_asm] (location_t loc, AST::MacroInvocData &invoc) {
-    return MacroBuiltin::asm_handler (loc, invoc, global_asm);
-  };
+  return
+    [global_asm] (location_t loc, AST::MacroInvocData &invoc, bool semicolon) {
+      return MacroBuiltin::asm_handler (loc, invoc, semicolon, global_asm);
+    };
 }
 
 std::unordered_map<std::string, AST::MacroTranscriberFunc>
@@ -167,7 +168,8 @@ builtin_macro_from_string (const std::string &identifier)
 }
 
 tl::optional<AST::Fragment>
-MacroBuiltin::sorry (location_t invoc_locus, AST::MacroInvocData &invoc)
+MacroBuiltin::sorry (location_t invoc_locus, AST::MacroInvocData &invoc,
+                    bool semicolon)
 {
   rust_sorry_at (invoc_locus, "unimplemented builtin macro: %qs",
                 invoc.get_path ().as_string ().c_str ());
@@ -177,7 +179,7 @@ MacroBuiltin::sorry (location_t invoc_locus, AST::MacroInvocData &invoc)
 
 tl::optional<AST::Fragment>
 MacroBuiltin::proc_macro_builtin (location_t invoc_locus,
-                                 AST::MacroInvocData &invoc)
+                                 AST::MacroInvocData &invoc, bool semicolon)
 {
   rust_error_at (invoc_locus, "cannot invoke derive macro: %qs",
                 invoc.get_path ().as_string ().c_str ());

diff --git a/gcc/rust/expand/rust-macro-builtins.h b/gcc/rust/expand/rust-macro-builtins.h
index d9873c712099afb4d67305acbad2f3e24dafc0b5..448fe216cbe34aabb40c78acddcf3ccccd4cb945 100644 (file)
--- a/gcc/rust/expand/rust-macro-builtins.h
+++ b/gcc/rust/expand/rust-macro-builtins.h
@@ -123,57 +123,70 @@ public:
   static std::unordered_map<std::string, AST::MacroTranscriberFunc>
     builtin_transcribers;
 
-  static tl::optional<AST::Fragment>
-  assert_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  static tl::optional<AST::Fragment> assert_handler (location_t invoc_locus,
+                                                    AST::MacroInvocData &invoc,
+                                                    bool semicolon);
 
   static tl::optional<AST::Fragment> file_handler (location_t invoc_locus,
-                                                  AST::MacroInvocData &invoc);
+                                                  AST::MacroInvocData &invoc,
+                                                  bool semicolon);
 
-  static tl::optional<AST::Fragment>
-  column_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  static tl::optional<AST::Fragment> column_handler (location_t invoc_locus,
+                                                    AST::MacroInvocData &invoc,
+                                                    bool semicolon);
 
   static tl::optional<AST::Fragment>
-  include_bytes_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  include_bytes_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                        bool semicolon);
 
   static tl::optional<AST::Fragment>
-  include_str_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  include_str_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                      bool semicolon);
 
   static tl::optional<AST::Fragment>
-  stringify_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  stringify_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                    bool semicolon);
 
   static tl::optional<AST::Fragment>
-  compile_error_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  compile_error_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                        bool semicolon);
 
-  static tl::optional<AST::Fragment>
-  concat_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  static tl::optional<AST::Fragment> concat_handler (location_t invoc_locus,
+                                                    AST::MacroInvocData &invoc,
+                                                    bool semicolon);
 
   static tl::optional<AST::Fragment> env_handler (location_t invoc_locus,
-                                                 AST::MacroInvocData &invoc);
+                                                 AST::MacroInvocData &invoc,
+                                                 bool semicolon);
 
   static tl::optional<AST::Fragment> cfg_handler (location_t invoc_locus,
-                                                 AST::MacroInvocData &invoc);
+                                                 AST::MacroInvocData &invoc,
+                                                 bool semicolon);
 
   static tl::optional<AST::Fragment>
-  include_handler (location_t invoc_locus, AST::MacroInvocData &invoc);
+  include_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
+                  bool semicolon);
 
   static tl::optional<AST::Fragment> line_handler (location_t invoc_locus,
-                                                  AST::MacroInvocData &invoc);
+                                                  AST::MacroInvocData &invoc,
+                                                  bool semicolon);
 
   static tl::optional<AST::Fragment> asm_handler (location_t invoc_locus,
                                                  AST::MacroInvocData &invoc,
+                                                 bool semicolon,
                                                  bool is_global_asm);
 
   static tl::optional<AST::Fragment>
   format_args_handler (location_t invoc_locus, AST::MacroInvocData &invoc,
-                      AST::FormatArgs::Newline nl);
+                      bool semicolon, AST::FormatArgs::Newline nl);
 
-  static tl::optional<AST::Fragment> sorry (location_t invoc_locus,
-                                           AST::MacroInvocData &invoc);
+  static tl::optional<AST::Fragment>
+  sorry (location_t invoc_locus, AST::MacroInvocData &invoc, bool semicolon);
 
   /* Builtin procedural macros do not work directly on tokens, but still need a
    * builtin transcriber to be considered proper builtin macros */
-  static tl::optional<AST::Fragment> proc_macro_builtin (location_t,
-                                                        AST::MacroInvocData &);
+  static tl::optional<AST::Fragment>
+  proc_macro_builtin (location_t, AST::MacroInvocData &, bool);
 };
 } // namespace Rust
 

diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index 1efc81a8b3f3a1c56fec1341667427aa6f80a520..9742bbc236dbe580f363e38e2816a199e0873979 100644 (file)
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -43,9 +43,10 @@ MacroExpander::expand_decl_macro (location_t invoc_locus,
 
   /* probably something here about parsing invoc and rules def token trees to
    * token stream. if not, how would parser handle the captures of exprs and
-   * stuff? on the other hand, token trees may be kind of useful in rules def as
-   * creating a point where recursion can occur (like having
-   * "compare_macro_match" and then it calling itself when it finds delimiters)
+   * stuff? on the other hand, token trees may be kind of useful in rules def
+   * as creating a point where recursion can occur (like having
+   * "compare_macro_match" and then it calling itself when it finds
+   * delimiters)
    */
 
   /* find matching rule to invoc token tree, based on macro rule's matcher. if
@@ -70,9 +71,10 @@ MacroExpander::expand_decl_macro (location_t invoc_locus,
 
   /* TODO: it is probably better to modify AST::Token to store a pointer to a
    * Lexer::Token (rather than being converted) - i.e. not so much have
-   * AST::Token as a Token but rather a TokenContainer (as it is another type of
-   * TokenTree). This will prevent re-conversion of Tokens between each type
-   * all the time, while still allowing the heterogenous storage of token trees.
+   * AST::Token as a Token but rather a TokenContainer (as it is another type
+   * of TokenTree). This will prevent re-conversion of Tokens between each
+   * type all the time, while still allowing the heterogenous storage of token
+   * trees.
    */
 
   AST::DelimTokenTree &invoc_token_tree = invoc.get_delim_tok_tree ();
@@ -286,8 +288,12 @@ MacroExpander::expand_invoc (AST::MacroInvocation &invoc, bool has_semicolon)
   last_invoc = *invoc.clone_macro_invocation_impl ();
   last_def = *rdef;
 
+  rust_debug ("[ARTHUR] semicolon: %s", has_semicolon ? "yes" : "no");
+
   if (rdef->is_builtin ())
-    fragment = rdef->get_builtin_transcriber () (invoc.get_locus (), invoc_data)
+    fragment = rdef
+                ->get_builtin_transcriber () (invoc.get_locus (), invoc_data,
+                                              has_semicolon)
                 .value_or (AST::Fragment::create_empty ());
   else
     fragment = expand_decl_macro (invoc.get_locus (), invoc_data, *rdef,

diff --git a/gcc/rust/hir/tree/rust-hir.cc b/gcc/rust/hir/tree/rust-hir.cc
index 7ad0de85a6cdf9fbfc9d26ea880fd6caa6e60bd4..b3de930c307595bb33170c8e9816ed898edb1144 100644 (file)
--- a/gcc/rust/hir/tree/rust-hir.cc
+++ b/gcc/rust/hir/tree/rust-hir.cc
@@ -3772,14 +3772,11 @@ BorrowExpr::accept_vis (HIRFullVisitor &vis)
 
 void
 InlineAsm::accept_vis (HIRExpressionVisitor &vis)
-{
-  rust_unreachable ();
-}
+{}
 
 void
 InlineAsm::accept_vis (HIRFullVisitor &vis)
 {
-  rust_unreachable ();
   vis.visit (*this);
 }