procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gccrs: nr2.0: Do not resolve modules this run if they are unloaded

Browse source 
Instead, mark the visitor as dirty and wait for the next round of the fixed point to take care of
them. This avoids issues with module items being loaded while not being stripped yet.

gcc/rust/ChangeLog:

	* resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Return if module
	is unloaded.
This commit is contained in:
Arthur Cohen 2025-04-04 14:18:33 +02:00
parent eb5eee065b
commit 6dcbbcd27c
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
View file

@ -113,7 +113,17 @@ TopLevel::visit (AST::Module &module)
// This was copied from the old early resolver method
// 'accumulate_escaped_macros'
if (module.get_kind () == AST::Module::UNLOADED)
module.load_items ();
{
module.load_items ();
// If the module was previously unloaded, then we don't want to visit it
// this time around as the CfgStrip hasn't run on its inner items yet.
// Skip it for now, mark the visitor as dirty and try again
dirty = true;
return;
}
DefaultResolver::visit (module);