gccrs: Use name resolver 2.0 during pattern typechecking

gcc/rust/ChangeLog:

	* typecheck/rust-hir-type-check-pattern.cc: Add includes.
	(TypeCheckPattern::visit): Use name resolver 2.0 if enabled.

	* resolve/rust-name-resolution-context.cc
	(NameResolutionContext::lookup): Make const qualified.
	* resolve/rust-name-resolution-context.h
	(NameResolutionContext::lookup): Likewise.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>

diff --git a/gcc/rust/resolve/rust-name-resolution-context.cc b/gcc/rust/resolve/rust-name-resolution-context.cc
index d79f7b5f222a9bf2321b7c946f004891dcabce6d..9bfaa094abe122914a4b8194cb294a249b9dff7c 100644 (file)
--- a/gcc/rust/resolve/rust-name-resolution-context.cc
+++ b/gcc/rust/resolve/rust-name-resolution-context.cc
@@ -92,7 +92,7 @@ NameResolutionContext::map_usage (Usage usage, Definition definition)
 }
 
 tl::optional<NodeId>
-NameResolutionContext::lookup (NodeId usage)
+NameResolutionContext::lookup (NodeId usage) const
 {
   auto it = resolved_nodes.find (Usage (usage));
 

diff --git a/gcc/rust/resolve/rust-name-resolution-context.h b/gcc/rust/resolve/rust-name-resolution-context.h
index e2652dc3b9eb9bb01d84020c6fc8b0f7bec1cfe1..cd6fa931be511388c4316b33bec63e63332d2d26 100644 (file)
--- a/gcc/rust/resolve/rust-name-resolution-context.h
+++ b/gcc/rust/resolve/rust-name-resolution-context.h
@@ -213,7 +213,7 @@ public:
   // TODO: Use newtype pattern for Usage and Definition
   void map_usage (Usage usage, Definition definition);
 
-  tl::optional<NodeId> lookup (NodeId usage);
+  tl::optional<NodeId> lookup (NodeId usage) const;
 
 private:
   /* Map of "usage" nodes which have been resolved to a "definition" node */

diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
index 53196369202cf99d459a45be3e27a62a93c3ced6..88e4d32f6bc23c52a24ca6e163fd39d6ae8d2ad0 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
@@ -20,6 +20,10 @@
 #include "rust-hir-pattern.h"
 #include "rust-hir-type-check-expr.h"
 #include "rust-type-util.h"
+#include "rust-immutable-name-resolution-context.h"
+
+// for flag_name_resolution_2_0
+#include "options.h"
 
 namespace Rust {
 namespace Resolver {
@@ -49,12 +53,26 @@ TypeCheckPattern::visit (HIR::PathInExpression &pattern)
 
   NodeId ref_node_id = UNKNOWN_NODEID;
   bool maybe_item = false;
-  maybe_item
-    |= resolver->lookup_resolved_name (pattern.get_mappings ().get_nodeid (),
-                                      &ref_node_id);
-  maybe_item
-    |= resolver->lookup_resolved_type (pattern.get_mappings ().get_nodeid (),
-                                      &ref_node_id);
+
+  if (flag_name_resolution_2_0)
+    {
+      auto &nr_ctx
+       = Resolver2_0::ImmutableNameResolutionContext::get ().resolver ();
+
+      if (auto id = nr_ctx.lookup (pattern.get_mappings ().get_nodeid ()))
+       {
+         ref_node_id = *id;
+         maybe_item = true;
+       }
+    }
+  else
+    {
+      maybe_item |= resolver->lookup_resolved_name (
+       pattern.get_mappings ().get_nodeid (), &ref_node_id);
+      maybe_item |= resolver->lookup_resolved_type (
+       pattern.get_mappings ().get_nodeid (), &ref_node_id);
+    }
+
   bool path_is_const_item = false;
 
   if (maybe_item)