From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Fri, 4 Apr 2025 12:21:00 +0000 (+0200)
Subject: gccrs: session: Desugar question mark operator after expansion instead.
X-Git-Tag: basepoints/gcc-16~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76477f965552b5872bb14255f272bff78978ef0c;p=thirdparty%2Fgcc.git

gccrs: session: Desugar question mark operator after expansion instead.

gcc/rust/ChangeLog:

	* rust-session-manager.cc (Session::compile_crate): Call the visitor later in the pipeline.
---

diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc
index 15f21ef12a9..48acbf34222 100644
--- a/gcc/rust/rust-session-manager.cc
+++ b/gcc/rust/rust-session-manager.cc
@@ -611,7 +611,6 @@ Session::compile_crate (const char *filename)
     return;
 
   AST::CollectLangItems ().go (parsed_crate);
-  AST::DesugarQuestionMark ().go (parsed_crate);
 
   auto name_resolution_ctx = Resolver2_0::NameResolutionContext ();
   // expansion pipeline stage
@@ -619,6 +618,7 @@ Session::compile_crate (const char *filename)
   expansion (parsed_crate, name_resolution_ctx);
 
   AST::DesugarForLoops ().go (parsed_crate);
+  AST::DesugarQuestionMark ().go (parsed_crate);
 
   rust_debug ("\033[0;31mSUCCESSFULLY FINISHED EXPANSION \033[0m");
   if (options.dump_option_enabled (CompileOptions::EXPANSION_DUMP))