diff options
| -rw-r--r-- | gcc/rust/resolve/rust-forever-stack.h | 7 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-forever-stack.hxx | 7 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nr2/exclude | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/gcc/rust/resolve/rust-forever-stack.h b/gcc/rust/resolve/rust-forever-stack.h index 7bfe651..74944fb 100644 --- a/gcc/rust/resolve/rust-forever-stack.h +++ b/gcc/rust/resolve/rust-forever-stack.h @@ -547,13 +547,16 @@ template <Namespace N> class ForeverStack { public: ForeverStack () - // FIXME: Is that valid? Do we use the root? If yes, we should give the - // crate's node id to ForeverStack's constructor : root (Node (Rib (Rib::Kind::Normal), UNKNOWN_NODEID)), cursor_reference (root) { rust_assert (root.is_root ()); rust_assert (root.is_leaf ()); + + // TODO: Should we be using the forever stack root as the crate scope? + // TODO: Is this how we should be getting the crate node id? + auto &mappings = Analysis::Mappings::get (); + root.id = *mappings.crate_num_to_nodeid (mappings.get_current_crate ()); } /** diff --git a/gcc/rust/resolve/rust-forever-stack.hxx b/gcc/rust/resolve/rust-forever-stack.hxx index 65dd02a..c2b348f 100644 --- a/gcc/rust/resolve/rust-forever-stack.hxx +++ b/gcc/rust/resolve/rust-forever-stack.hxx @@ -401,12 +401,7 @@ ForeverStack<N>::find_starting_point ( if (seg.is_crate_path_seg ()) { starting_point = root; - // TODO: is this how we should be getting the crate node id? - auto &mappings = Analysis::Mappings::get (); - NodeId current_crate - = *mappings.crate_num_to_nodeid (mappings.get_current_crate ()); - - insert_segment_resolution (outer_seg, current_crate); + insert_segment_resolution (outer_seg, starting_point.get ().id); iterator++; break; } diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude index 763387f..e179dc3 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -1,7 +1,6 @@ break-rust2.rs canonical_paths1.rs cfg1.rs -complex-path1.rs const_generics_3.rs const_generics_4.rs feature_rust_attri0.rs @@ -29,7 +28,6 @@ pub_restricted_2.rs pub_restricted_3.rs redef_error2.rs redef_error5.rs -self-path1.rs self-path2.rs sizeof-stray-infer-var-bug.rs struct-expr-parse.rs |