From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Wed, 28 Jun 2023 14:16:08 +0000 (+0200)
Subject: gccrs: collector: Fix abi output
X-Git-Tag: basepoints/gcc-15~2377
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=030786a9680b0206480ebda372c1fb5d2aa19a59;p=thirdparty%2Fgcc.git

gccrs: collector: Fix abi output

Abi did output as several tokens instead of a fixed string.

gcc/rust/ChangeLog:

	* ast/rust-ast-collector.cc (TokenCollector::visit): Fix abit
	output format.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/ast/rust-ast-collector.cc b/gcc/rust/ast/rust-ast-collector.cc
index f1306e738fd6..fcd9521917fb 100644
--- a/gcc/rust/ast/rust-ast-collector.cc
+++ b/gcc/rust/ast/rust-ast-collector.cc
@@ -366,10 +366,8 @@ TokenCollector::visit (FunctionQualifiers &qualifiers)
       push (Rust::Token::make (EXTERN_TOK, qualifiers.get_locus ()));
       if (qualifiers.has_abi ())
 	{
-	  push (Rust::Token::make (DOUBLE_QUOTE, Location ()));
-	  auto abi = qualifiers.get_extern_abi ();
-	  push (Rust::Token::make_identifier (Location (), std::move (abi)));
-	  push (Rust::Token::make (DOUBLE_QUOTE, Location ()));
+	  push (Rust::Token::make_string (Location (),
+					  qualifiers.get_extern_abi ()));
 	}
     }
 }