diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2024-10-15 22:24:29 -0400 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-10-24 07:35:23 +0000 |
| commit | bcc83c32a74b5bb3fd8c29a7ba15022d38c739e7 (patch) | |
| tree | 3e0987e32d56b5f19ec7b472015d51d68a0e4d13 /gcc | |
| parent | d833d233c205a5bd19bb9a3d8254b2f24cf2ce22 (diff) | |
| download | gcc-bcc83c32a74b5bb3fd8c29a7ba15022d38c739e7.zip gcc-bcc83c32a74b5bb3fd8c29a7ba15022d38c739e7.tar.gz gcc-bcc83c32a74b5bb3fd8c29a7ba15022d38c739e7.tar.bz2 | |
Load unloaded modules during toplevel resolution 2.0
This may load conditionally compiled modules too eagerly.
gcc/rust/ChangeLog:
* resolve/rust-toplevel-name-resolver-2.0.cc
(TopLevel::visit): Load unloaded modules before attempting to
visit their items.
gcc/testsuite/ChangeLog:
* rust/compile/nr2/exclude: Remove issue-1089.rs.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 11 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nr2/exclude | 1 |
2 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 c4dfdb2..9a56145 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -76,6 +76,17 @@ TopLevel::visit (AST::Module &module) { insert_or_error_out (module.get_name (), module, Namespace::Types); + // Parse the module's items if they haven't been expanded and the file + // should be parsed (i.e isn't hidden behind an untrue or impossible cfg + // directive + // TODO: make sure this is right + // TODO: avoid loading items if cfg attributes are present? + // might not be needed if this runs after early resolution? + // This was copied from the old early resolver method + // 'accumulate_escaped_macros' + if (module.get_kind () == AST::Module::UNLOADED) + module.load_items (); + auto sub_visitor = [this, &module] () { for (auto &item : module.get_items ()) item->accept_vis (*this); diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude index f91cf31..a698164 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -62,7 +62,6 @@ infer-crate-name.rs issue-1019.rs issue-1031.rs issue-1034.rs -issue-1089.rs issue-1128.rs issue-1129-2.rs issue-1130.rs |