public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] Cleanup canonical path usage on impl blocks
@ 2022-08-29 15:31 Thomas Schwinge
0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2022-08-29 15:31 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:6dea70e1dafa603b2327bfb936d26fac95f46069
commit 6dea70e1dafa603b2327bfb936d26fac95f46069
Author: Philip Herron <philip.herron@embecosm.com>
Date: Mon Aug 22 12:22:54 2022 +0100
Cleanup canonical path usage on impl blocks
Diff:
---
gcc/rust/resolve/rust-ast-resolve-item.cc | 40 ++++++++++++++-----------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc
index 75bd2e10b1c..0c38f28d530 100644
--- a/gcc/rust/resolve/rust-ast-resolve-item.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-item.cc
@@ -534,25 +534,17 @@ ResolveItem::visit (AST::InherentImpl &impl_block)
// FIXME this needs to be protected behind nominal type-checks see:
// rustc --explain E0118
-
- NodeId resolved_node = ResolveType::go (impl_block.get_type ().get ());
- if (resolved_node == UNKNOWN_NODEID)
- {
- resolver->get_type_scope ().pop ();
- resolver->get_name_scope ().pop ();
- return;
- }
+ ResolveType::go (impl_block.get_type ().get ());
// Setup paths
CanonicalPath self_cpath = CanonicalPath::create_empty ();
bool ok = ResolveTypeToCanonicalPath::go (impl_block.get_type ().get (),
self_cpath);
rust_assert (ok);
+ rust_debug ("AST::InherentImpl resolve Self: {%s}",
+ self_cpath.get ().c_str ());
- std::string raw_impl_type_path = impl_block.get_type ()->as_string ();
- CanonicalPath impl_type
- = CanonicalPath::new_seg (impl_block.get_type ()->get_node_id (),
- raw_impl_type_path);
+ CanonicalPath impl_type = self_cpath;
CanonicalPath impl_prefix = prefix.append (impl_type);
// see https://godbolt.org/z/a3vMbsT6W
@@ -580,6 +572,9 @@ ResolveItem::visit (AST::InherentImpl &impl_block)
for (auto &impl_item : impl_block.get_impl_items ())
{
+ rust_debug (
+ "AST::InherentImpl resolve_impl_item: impl_prefix={%s} cpath={%s}",
+ impl_prefix.get ().c_str (), cpath.get ().c_str ());
resolve_impl_item (impl_item.get (), impl_prefix, cpath);
}
@@ -703,22 +698,20 @@ ResolveItem::visit (AST::TraitImpl &impl_block)
canonical_trait_type);
rust_assert (ok);
+ rust_debug ("AST::TraitImpl resolve trait type: {%s}",
+ canonical_trait_type.get ().c_str ());
+
CanonicalPath canonical_impl_type = CanonicalPath::create_empty ();
ok = ResolveTypeToCanonicalPath::go (impl_block.get_type ().get (),
canonical_impl_type);
rust_assert (ok);
- // raw paths
- std::string raw_impl_type_path = impl_block.get_type ()->as_string ();
- CanonicalPath impl_type_seg
- = CanonicalPath::new_seg (impl_block.get_type ()->get_node_id (),
- raw_impl_type_path);
-
- std::string raw_trait_type_path = impl_block.get_trait_path ().as_string ();
- CanonicalPath trait_type_seg
- = CanonicalPath::new_seg (impl_block.get_trait_path ().get_node_id (),
- raw_trait_type_path);
+ rust_debug ("AST::TraitImpl resolve self: {%s}",
+ canonical_impl_type.get ().c_str ());
+ // raw paths
+ CanonicalPath impl_type_seg = canonical_impl_type;
+ CanonicalPath trait_type_seg = canonical_trait_type;
CanonicalPath projection
= CanonicalPath::trait_impl_projection_seg (impl_block.get_node_id (),
trait_type_seg, impl_type_seg);
@@ -756,6 +749,9 @@ ResolveItem::visit (AST::TraitImpl &impl_block)
for (auto &impl_item : impl_block.get_impl_items ())
{
+ rust_debug (
+ "AST::TraitImpl resolve_impl_item: impl_prefix={%s} cpath={%s}",
+ impl_prefix.get ().c_str (), cpath.get ().c_str ());
resolve_impl_item (impl_item.get (), impl_prefix, cpath);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-08-29 15:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-29 15:31 [gcc/devel/rust/master] Cleanup canonical path usage on impl blocks Thomas Schwinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).