diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-04-04 14:18:33 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2025-04-14 07:40:11 +0000 |
| commit | fd6257bc2894124c328757ff08221580f6ea105b (patch) | |
| tree | 80084f123c60d7af1ff8c7b3c7f17dcb62579cf0 /gcc | |
| parent | b9fdd60c28472f8163f7952bee2473e1d8e6981e (diff) | |
| download | gcc-fd6257bc2894124c328757ff08221580f6ea105b.zip gcc-fd6257bc2894124c328757ff08221580f6ea105b.tar.gz gcc-fd6257bc2894124c328757ff08221580f6ea105b.tar.bz2 | |
nr2.0: Do not resolve modules this run if they are unloaded
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc index 2c0cc66..e276d65 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -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); |