nr1.0: Remove

This patch removes the old name resolver, leaving only the 2.0 name
resolver.

gcc/rust/ChangeLog:

	* Make-lang.in (GRS_OBJS): Remove entries for deleted files.
	* expand/rust-macro-builtins-helpers.h: Remove inclusion of
	"rust-early-name-resolver.h".
	* expand/rust-macro-builtins.cc: Likewise.
	* expand/rust-macro-expand.cc: Likewise.
	(MacroExpander::expand_crate): Remove usage of nr1.0 resolver.
	* expand/rust-macro-expand.h: Remove inclusion of
	"rust-early-name-resolver.h".
	(MacroExpander::MacroExpander): Remove initialization of
	resolver member variable.
	(MacroExpander::resolver): Remove member variable.
	* lang.opt (frust-name-resolution-2.0): Remove option.
	* resolve/rust-name-resolver.cc: Remove inclusion of
	"options.h".
	(Resolver::Resolver): Remove member function definition.
	(Resolver::get): Likewise.
	(Resolver::push_new_name_rib): Likewise.
	(Resolver::push_new_type_rib): Likewise.
	(Resolver::push_new_label_rib): Likewise.
	(Resolver::push_new_macro_rib): Likewise.
	(Resolver::find_name_rib): Likewise.
	(Resolver::find_type_rib): Likewise.
	(Resolver::find_macro_rib): Likewise.
	(Resolver::insert_builtin_types): Likewise.
	(Resolver::get_builtin_types): Likewise.
	(Resolver::generate_builtins): Likewise.
	(Resolver::setup_builtin): Likewise.
	(Resolver::insert_resolved_name): Likewise.
	(Resolver::lookup_resolved_name): Likewise.
	(Resolver::insert_resolved_type): Likewise.
	(Resolver::lookup_resolved_type): Likewise.
	(Resolver::insert_resolved_label): Likewise.
	(Resolver::lookup_resolved_label): Likewise.
	(Resolver::insert_resolved_macro): Likewise.
	(Resolver::lookup_resolved_macro): Likewise.
	(Resolver::insert_resolved_misc): Likewise.
	(Resolver::lookup_resolved_misc): Likewise.
	(Resolver::push_closure_context): Likewise.
	(Resolver::pop_closure_context): Likewise.
	(Resolver::insert_captured_item): Likewise.
	(Resolver::decl_needs_capture): Likewise.
	(Resolver::get_captures): Likewise.
	* resolve/rust-name-resolver.h (class Resolver): Remove.
	* rust-lang.cc: Remove inclusion of "rust-ast-resolve-item.h".
	(run_rust_tests): Remove call to rust_simple_path_resolve_test.
	* rust-session-manager.cc: Remove inclusions of
	"rust-ast-resolve.h" and "rust-early-name-resolver.h".
	(Session::compile_crate): Assume nr2.0 is enabled.
	(Session::expansion): Likewise.
	(Session::load_extern_crate): Likewise.
	* resolve/rust-ast-resolve-base.cc: Removed.
	* resolve/rust-ast-resolve-base.h: Removed.
	* resolve/rust-ast-resolve-expr.cc: Removed.
	* resolve/rust-ast-resolve-expr.h: Removed.
	* resolve/rust-ast-resolve-item.cc: Removed.
	* resolve/rust-ast-resolve-item.h: Removed.
	* resolve/rust-ast-resolve-path.cc: Removed.
	* resolve/rust-ast-resolve-path.h: Removed.
	* resolve/rust-ast-resolve-pattern.cc: Removed.
	* resolve/rust-ast-resolve-pattern.h: Removed.
	* resolve/rust-ast-resolve-stmt.cc: Removed.
	* resolve/rust-ast-resolve-stmt.h: Removed.
	* resolve/rust-ast-resolve-struct-expr-field.cc: Removed.
	* resolve/rust-ast-resolve-struct-expr-field.h: Removed.
	* resolve/rust-ast-resolve-toplevel.h: Removed.
	* resolve/rust-ast-resolve-type.cc: Removed.
	* resolve/rust-ast-resolve-type.h: Removed.
	* resolve/rust-ast-resolve.cc: Removed.
	* resolve/rust-ast-resolve.h: Removed.
	* resolve/rust-early-name-resolver.cc: Removed.
	* resolve/rust-early-name-resolver.h: Removed.

Signed-off-by: Owen Avery <[email protected]>

Author: powerboat9

gcc/rust/Make-lang.in

@@ -147,18 +147,8 @@ GRS_OBJS = \
 	rust/rust-ice-finalizer.o \
     rust/rust-late-name-resolver-2.0.o \
 	rust/rust-immutable-name-resolution-context.o \
-    rust/rust-early-name-resolver.o \
     rust/rust-name-resolver.o \
     rust/rust-resolve-builtins.o \
-    rust/rust-ast-resolve.o \
-    rust/rust-ast-resolve-base.o \
-    rust/rust-ast-resolve-item.o \
-    rust/rust-ast-resolve-pattern.o \
-    rust/rust-ast-resolve-expr.o \
-    rust/rust-ast-resolve-type.o \
-    rust/rust-ast-resolve-path.o \
-    rust/rust-ast-resolve-stmt.o \
-    rust/rust-ast-resolve-struct-expr-field.o \
     rust/rust-forever-stack.o \
     rust/rust-hir-type-check.o \
     rust/rust-privacy-check.o \

gcc/rust/expand/rust-macro-builtins-helpers.h

@@ -22,7 +22,6 @@
 #include "rust-ast.h"
 #include "rust-cfg-strip.h"
 #include "rust-diagnostics.h"
-#include "rust-early-name-resolver.h"
 #include "rust-expr.h"
 #include "rust-lex.h"
 #include "rust-macro-builtins.h"

gcc/rust/expand/rust-macro-builtins.cc

@@ -29,7 +29,6 @@
 #include "rust-ast.h"
 #include "rust-cfg-strip.h"
 #include "rust-diagnostics.h"
-#include "rust-early-name-resolver.h"
 #include "rust-expr.h"
 #include "rust-lex.h"
 #include "rust-macro-invoc-lexer.h"

gcc/rust/expand/rust-macro-expand.cc

@@ -27,7 +27,6 @@
 #include "rust-macro.h"
 #include "rust-parse.h"
 #include "rust-cfg-strip.h"
-#include "rust-early-name-resolver.h"
 #include "rust-proc-macro.h"
 #include "rust-token-tree-desugar.h"
 
@@ -335,9 +334,6 @@ MacroExpander::expand_invoc (AST::MacroInvocation &invoc,
 void
 MacroExpander::expand_crate ()
 {
-  NodeId scope_node_id = crate.get_node_id ();
-  resolver->get_macro_scope ().push (scope_node_id);
-
   /* fill macro/decorator map from init list? not sure where init list comes
    * from? */
 

gcc/rust/expand/rust-macro-expand.h

@@ -27,7 +27,6 @@
 #include "rust-ast.h"
 #include "rust-macro.h"
 #include "rust-hir-map.h"
-#include "rust-early-name-resolver.h"
 #include "rust-name-resolver.h"
 #include "rust-macro-invoc-lexer.h"
 #include "rust-proc-macro-invoc-lexer.h"
@@ -301,8 +300,7 @@ struct MacroExpander
     : cfg (cfg), crate (crate), session (session),
       sub_stack (SubstitutionScope ()),
       expanded_fragment (AST::Fragment::create_error ()),
-      has_changed_flag (false), resolver (Resolver::Resolver::get ()),
-      mappings (Analysis::Mappings::get ())
+      has_changed_flag (false), mappings (Analysis::Mappings::get ())
   {}
 
   ~MacroExpander () = default;
@@ -514,7 +512,6 @@ struct MacroExpander
   tl::optional<AST::MacroInvocation &> last_invoc;
 
 public:
-  Resolver::Resolver *resolver;
   Analysis::Mappings &mappings;
 };
 

gcc/rust/lang.opt

@@ -204,10 +204,6 @@ Enum(frust_compile_until) String(compilation) Value(12)
 EnumValue
 Enum(frust_compile_until) String(end) Value(13)
 
-frust-name-resolution-2.0
-Rust Var(flag_name_resolution_2_0) Init(1)
-Use the temporary and experimental name resolution pipeline instead of the stable one
-
 frust-borrowcheck
 Rust Var(flag_borrowcheck)
 Use the WIP borrow checker.