nr2.0: Add base for Early name resolution #2470

CohenArthur · 2023-07-26T00:27:37Z

This adds a base visitor for resolving macro invocations in the new name resolution 2.0 algorithm. Needs #2469 and #2456

CohenArthur · 2023-07-26T00:30:50Z

will drop annoying commits from this PR and #2469 tomorrow, just running builds and testsuite on all commits here and can't really modify the branch while doing a git rebase upstream/master -x ...

gcc/rust/resolve/rust-default-resolver.cc

P-E-P · 2023-07-27T11:54:48Z

gcc/rust/resolve/rust-default-resolver.cc

+{}
+
+void
+DefaultResolver::visit (AST::IdentifierPattern &)


Identifier pattern contains name binding value (@ syntax)

gcc/rust/resolve/rust-default-resolver.h

matthewjasper · 2023-07-29T19:44:16Z

gcc/testsuite/rust/compile/name_resolution6.rs

@@ -0,0 +1,42 @@
+// { dg-options "-frust-name-resolution-2.0" }


It would be nice to have a couple of simpler tests that are easier to undetstand here. Maybe also have test(s) that compile successfully to check things expand correctly.

expansion should not change after this new name resolution algorithm, so I plan to just reuse the existing expansion testsuite when we enable name resolution 2.0 by default. I will split up the test in simpler ones though, you are completely right

matthewjasper · 2023-07-29T20:01:01Z

gcc/rust/resolve/rust-default-resolver.cc

+
+void
+DefaultResolver::visit (AST::CallExpr &expr)
+{}


Should everything be visiting children here? The classes derived from this are presumably also going to be handling uses,

yes, this should visit the called expression as well as each given argument and generic arguments if any - good catch

matthewjasper · 2023-07-29T20:02:46Z

gcc/rust/resolve/rust-early-name-resolver-2.0.cc

+  if (!definition.has_value ())
+    {
+      rust_error_at (invoc.get_locus (), ErrorCode ("E0433"),
+		     "could not resolve macro invocation");


This will need to be changed for macros that expand to macro definitions.

yes, I plan on working on this soon - basically keep a list of errors and run both the expander and resolver in a fixed point, and if the fixed point is done and we still have errors, emit them, otherwise nope

matthewjasper · 2023-07-29T20:04:41Z

gcc/rust/resolve/rust-early-name-resolver-2.0.cc

+}
+
+void
+Early::visit (AST::BlockExpr &block)


Am I missing where modules are handled?

Modules are handled directly in the TopLevel visitor - I don't think we have anything to do in the Early visitor other than resolve use statements to the proper node

They need their own textual scopes, for cases like this

mod a { // No #[macro_use] macro_rules! mac { () => {} } mac!(); // OK } mac!(); // ERROR - `mac` not in scope

ah, right! I missed them. they'll get the same treatment as block expressions:

void Early::visit (AST::BlockExpr &block) { textual_scope.push (); DefaultResolver::visit (block); textual_scope.pop (); }

thank you for noticing!

just realized that's the line you were pointing to lol. sorry I'm super tired haha

matthewjasper · 2023-07-29T20:13:00Z

gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc

+TopLevel::visit (AST::MacroRulesDefinition &macro)
+{
+  // we do not insert macros in the current rib as that needs to be done in the
+  // textual scope of the Early pass. we only insert them in the root of the


macro definitions (which libcore uses for some built in macros) are inserted in module scopes,

grrrrr you're right. I hate macro name resolution rules lol. thank you! I'll take care of this

matthewjasper · 2023-07-29T20:26:01Z

gcc/rust/resolve/rust-name-resolver-2.0.h

+*/
+
+// Now our resolver, which keeps track of all the `ForeverStack`s we could want
+class Resolver


Having a class called Resolver that does not inherit from DefaultResolver is a bit confusing.

That's a good point. I'll rename it to ResolverContext, which is different from what we had but makes more sense IMO

P-E-P

LGTM (once CI succeed)

gcc/rust/ChangeLog: * resolve/rust-rib.h: Add shadowing parameter. Make kind field public. * resolve/rust-rib.cc (Rib::insert): Likewise.

gcc/rust/ChangeLog: * resolve/rust-forever-stack.h (insert_at_root): New method. (resolve_path): New method. (reverse_iter): Iterate on `Node`s instead of `Rib`s * resolve/rust-forever-stack.hxx: Add path resolution.

gcc/rust/ChangeLog: * resolve/rust-name-resolution-context.cc (Resolver::insert): Do not call into `rust_unreachable` when resolving macros anymore.

gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::insert_or_error_out): Fix format string. (is_macro_export): New method. (TopLevel::visit): Handle macro definitions.

gcc/rust/ChangeLog: * resolve/rust-default-resolver.cc (DefaultResolver::visit): Visit CallExpr and MethodCallExpr properly. * resolve/rust-default-resolver.h: Switch "node" to plural in documentation.

This visitor takes care of resolving macro invocations, procedural macros and imports - it is used in conjunction with the `TopLevel` pass and the macro expander. gcc/rust/ChangeLog: * Make-lang.in: Add new object file. * resolve/rust-early-name-resolver-2.0.cc: New file. * resolve/rust-early-name-resolver-2.0.h: New file.

gcc/rust/ChangeLog: * rust-session-manager.cc (Session::expansion): Use new `Early` name resolution 2.0 pass

gcc/testsuite/ChangeLog: * rust/compile/name_resolution6.rs: New test. * rust/compile/name_resolution7.rs: New test. * rust/compile/name_resolution8.rs: New test. * rust/compile/name_resolution9.rs: New test.

gcc/rust/ChangeLog: * ast/rust-macro.h: Add new method to `MacroRulesDefinition` to allow getting the `MacroKind` contained.

gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Declare macros in the current rib if they are macros 2.0.

gcc/testsuite/ChangeLog: * rust/compile/name_resolution10.rs: New test.

CohenArthur added the enhancement label Jul 26, 2023

CohenArthur added this to the AST Pipeline for libcore 1.49 Complete milestone Jul 26, 2023

CohenArthur force-pushed the nr2.0-early-name-resolver branch 2 times, most recently from df43d22 to 1f9735b Compare July 27, 2023 08:06

CohenArthur requested a review from P-E-P July 27, 2023 12:10

P-E-P reviewed Jul 27, 2023

View reviewed changes

CohenArthur force-pushed the nr2.0-early-name-resolver branch 2 times, most recently from afe484e to 4904d3b Compare July 27, 2023 15:01

matthewjasper reviewed Jul 29, 2023

View reviewed changes

CohenArthur force-pushed the nr2.0-early-name-resolver branch 4 times, most recently from 969e6d9 to afc1ca4 Compare August 2, 2023 11:58

CohenArthur requested review from matthewjasper and P-E-P August 2, 2023 12:02

P-E-P approved these changes Aug 3, 2023

View reviewed changes

P-E-P mentioned this pull request Aug 3, 2023

Name resolve proc macros #2496

Merged

CohenArthur force-pushed the nr2.0-early-name-resolver branch 3 times, most recently from d58408c to 011356c Compare August 3, 2023 12:50

CohenArthur enabled auto-merge August 3, 2023 12:52

CohenArthur force-pushed the nr2.0-early-name-resolver branch 2 times, most recently from 0e3cb01 to ef60369 Compare August 3, 2023 13:48

CohenArthur disabled auto-merge August 3, 2023 13:48

CohenArthur enabled auto-merge August 3, 2023 13:48

matthewjasper approved these changes Aug 3, 2023

View reviewed changes

CohenArthur added 3 commits August 3, 2023 17:43

rib2.0: Add shadowing

3638e5c

gcc/rust/ChangeLog: * resolve/rust-rib.h: Add shadowing parameter. Make kind field public. * resolve/rust-rib.cc (Rib::insert): Likewise.

forever stack: Add path resolution

4323e5a

gcc/rust/ChangeLog: * resolve/rust-forever-stack.h (insert_at_root): New method. (resolve_path): New method. (reverse_iter): Iterate on `Node`s instead of `Rib`s * resolve/rust-forever-stack.hxx: Add path resolution.

resolver: Resolve macros too.

bd0ecfa

gcc/rust/ChangeLog: * resolve/rust-name-resolution-context.cc (Resolver::insert): Do not call into `rust_unreachable` when resolving macros anymore.

CohenArthur added 8 commits August 3, 2023 17:43

toplevel: Handle macro definitions properly

bd71fbc

gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::insert_or_error_out): Fix format string. (is_macro_export): New method. (TopLevel::visit): Handle macro definitions.

nr2.0: Visit receiver/call expression and arguments in calls/methods

9e10727

gcc/rust/ChangeLog: * resolve/rust-default-resolver.cc (DefaultResolver::visit): Visit CallExpr and MethodCallExpr properly. * resolve/rust-default-resolver.h: Switch "node" to plural in documentation.

session-manager: Run name resolution 2.0 if the option is present

78285de

gcc/rust/ChangeLog: * rust-session-manager.cc (Session::expansion): Use new `Early` name resolution 2.0 pass

nr2.0: Add complex macro name resolution test cases

aae5e38

gcc/testsuite/ChangeLog: * rust/compile/name_resolution6.rs: New test. * rust/compile/name_resolution7.rs: New test. * rust/compile/name_resolution8.rs: New test. * rust/compile/name_resolution9.rs: New test.

ast: Add get_kind method to MacroRulesDefinition

e124e75

gcc/rust/ChangeLog: * ast/rust-macro.h: Add new method to `MacroRulesDefinition` to allow getting the `MacroKind` contained.

nr2.0: Add macros 2.0 in Ribs in TopLevel visitor

3bcf5c3

gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Declare macros in the current rib if they are macros 2.0.

nr2.0: Add macros 2.0 resolution testcase.

fe2dae1

gcc/testsuite/ChangeLog: * rust/compile/name_resolution10.rs: New test.

CohenArthur force-pushed the nr2.0-early-name-resolver branch from ef60369 to fe2dae1 Compare August 3, 2023 16:44

CohenArthur added this pull request to the merge queue Aug 3, 2023

Merged via the queue into Rust-GCC:master with commit f7d9373 Aug 3, 2023
9 checks passed

CohenArthur mentioned this pull request Aug 23, 2023

Invalid resolution for path with too many super segments #2466

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nr2.0: Add base for Early name resolution #2470

nr2.0: Add base for Early name resolution #2470

CohenArthur commented Jul 26, 2023

CohenArthur commented Jul 26, 2023

P-E-P Jul 27, 2023

matthewjasper Jul 29, 2023

CohenArthur Aug 2, 2023

matthewjasper Jul 29, 2023

CohenArthur Aug 2, 2023

matthewjasper Jul 29, 2023

CohenArthur Jul 31, 2023

matthewjasper Jul 29, 2023

CohenArthur Jul 31, 2023

matthewjasper Jul 31, 2023

CohenArthur Jul 31, 2023

CohenArthur Jul 31, 2023

matthewjasper Jul 29, 2023

CohenArthur Jul 31, 2023

matthewjasper Jul 29, 2023

CohenArthur Jul 31, 2023

P-E-P left a comment •

edited

Loading

		@@ -0,0 +1,42 @@
		// { dg-options "-frust-name-resolution-2.0" }

nr2.0: Add base for Early name resolution #2470

nr2.0: Add base for Early name resolution #2470

Conversation

CohenArthur commented Jul 26, 2023

CohenArthur commented Jul 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

P-E-P left a comment • edited Loading

Choose a reason for hiding this comment

P-E-P left a comment •

edited

Loading