diff options
| author | Raiki Tamura <tamaron1203@gmail.com> | 2023-09-20 13:42:02 +0900 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2023-09-26 12:16:04 +0000 |
| commit | d0742b3695d171fbafee44edff72409d2838b0e8 (patch) | |
| tree | 0260e21e9df5b78b829807b52f0125ac7724b4f3 | |
| parent | 4d6a0094e9b0316d80b264fa85347b29be43af68 (diff) | |
| download | gcc-d0742b3695d171fbafee44edff72409d2838b0e8.zip gcc-d0742b3695d171fbafee44edff72409d2838b0e8.tar.gz gcc-d0742b3695d171fbafee44edff72409d2838b0e8.tar.bz2 | |
Fix CanonicalPath for inherent impl
gcc/rust/ChangeLog:
* util/rust-canonical-path.h: Add new segment kind for inherent impl.
* resolve/rust-ast-resolve-item.cc (ResolveItem::visit): Use it.
* resolve/rust-ast-resolve-toplevel.h: Use it.
Signed-off-by: Raiki Tamura <tamaron1203@gmail.com>
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-item.cc | 7 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-toplevel.h | 8 | ||||
| -rw-r--r-- | gcc/rust/util/rust-canonical-path.h | 6 |
3 files changed, 17 insertions, 4 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc index 52adde8..baab622 100644 --- a/gcc/rust/resolve/rust-ast-resolve-item.cc +++ b/gcc/rust/resolve/rust-ast-resolve-item.cc @@ -565,6 +565,7 @@ ResolveItem::visit (AST::InherentImpl &impl_block) // FIXME this needs to be protected behind nominal type-checks see: // rustc --explain E0118 + // issue #2634 ResolveType::go (impl_block.get_type ().get ()); // Setup paths @@ -576,13 +577,15 @@ ResolveItem::visit (AST::InherentImpl &impl_block) self_cpath.get ().c_str ()); CanonicalPath impl_type = self_cpath; - CanonicalPath impl_prefix = prefix.append (impl_type); + CanonicalPath impl_type_seg + = CanonicalPath::inherent_impl_seg (impl_block.get_node_id (), impl_type); + CanonicalPath impl_prefix = prefix.append (impl_type_seg); // see https://godbolt.org/z/a3vMbsT6W CanonicalPath cpath = CanonicalPath::create_empty (); if (canonical_prefix.size () <= 1) { - cpath = self_cpath; + cpath = impl_prefix; } else { diff --git a/gcc/rust/resolve/rust-ast-resolve-toplevel.h b/gcc/rust/resolve/rust-ast-resolve-toplevel.h index 9ba8bdb..50f31dc 100644 --- a/gcc/rust/resolve/rust-ast-resolve-toplevel.h +++ b/gcc/rust/resolve/rust-ast-resolve-toplevel.h @@ -344,10 +344,14 @@ public: void visit (AST::InherentImpl &impl_block) override { std::string raw_impl_type_path = impl_block.get_type ()->as_string (); - CanonicalPath impl_type + CanonicalPath impl_type_seg = CanonicalPath::new_seg (impl_block.get_type ()->get_node_id (), raw_impl_type_path); - CanonicalPath impl_prefix = prefix.append (impl_type); + + CanonicalPath impl_type + = CanonicalPath::inherent_impl_seg (impl_block.get_node_id (), + impl_type_seg); + CanonicalPath impl_prefix = prefix.append (impl_type_seg); for (auto &impl_item : impl_block.get_impl_items ()) ResolveToplevelImplItem::go (impl_item.get (), impl_prefix); diff --git a/gcc/rust/util/rust-canonical-path.h b/gcc/rust/util/rust-canonical-path.h index 2f28302..8c275a7 100644 --- a/gcc/rust/util/rust-canonical-path.h +++ b/gcc/rust/util/rust-canonical-path.h @@ -69,6 +69,12 @@ public: + trait_seg.get () + ">"); } + static CanonicalPath inherent_impl_seg (NodeId id, + const CanonicalPath &impl_type_seg) + { + return CanonicalPath::new_seg (id, "<" + impl_type_seg.get () + ">"); + } + std::string get () const { std::string buf; |