Retrieve token stream before vector move

P-E-P · P-E-P · commit 1d9edfc8c0ff · 2025-08-01T15:50:54.000Z
gcc/rust/ChangeLog:

	* expand/rust-macro-builtins-helpers.cc: Remove use after move.

Signed-off-by: Pierre-Emmanuel Patry &lt;pierre-emmanuel.patry@embecosm.com&gt;
diff --git a/gcc/rust/expand/rust-macro-builtins-helpers.cc b/gcc/rust/expand/rust-macro-builtins-helpers.cc
@@ -68,6 +68,7 @@ make_eager_builtin_invocation (
 {
   auto path_str = make_macro_path_str (kind);
 
+  auto token_stream = arguments.to_token_stream ();
   std::unique_ptr<AST::Expr> node = AST::MacroInvocation::Builtin (
     kind,
     AST::MacroInvocData (AST::SimplePath (
@@ -76,7 +77,7 @@ make_eager_builtin_invocation (
     {}, locus, std::move (pending_invocations));
 
   return AST::Fragment ({AST::SingleASTNode (std::move (node))},
-			arguments.to_token_stream ());
+			std::move (token_stream));
 }
 
 /* Match the end token of a macro given the start delimiter of the macro */

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ make_eager_builtin_invocation (`
`68`	`68`	`{`
`69`	`69`	`auto path_str = make_macro_path_str (kind);`
`70`	`70`
	`71`	`+ auto token_stream = arguments.to_token_stream ();`
`71`	`72`	`std::unique_ptr<AST::Expr> node = AST::MacroInvocation::Builtin (`
`72`	`73`	`kind,`
`73`	`74`	`AST::MacroInvocData (AST::SimplePath (`
`@@ -76,7 +77,7 @@ make_eager_builtin_invocation (`
`76`	`77`	`{}, locus, std::move (pending_invocations));`
`77`	`78`
`78`	`79`	`return AST::Fragment ({AST::SingleASTNode (std::move (node))},`
`79`		`- arguments.to_token_stream ());`
	`80`	`+ std::move (token_stream));`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/* Match the end token of a macro given the start delimiter of the macro */`