Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement experimental module selectors (MyMod::someName) feature #34556

Open
wants to merge 44 commits into
base: main
Choose a base branch
from

Conversation

beccadax
Copy link
Contributor

@beccadax beccadax commented Nov 3, 2020

This pull request begins to implement "module selectors", which allow references to declarations to be unambiguously prefixed with a module they can be found through:

class MyClass: ObjectiveC::NSObject {}  // OK, ObjectiveC defines NSObject
class MyClass: Foundation::NSObject {}  // OK, Foundation re-exports NSObject
class MyClass: Swift::NSObject {}       // error, Swift does not re-export or define NSObject
class MyClass: MyModule::NSObject {}    // error, MyModule does not re-export or define NSObject

This PR parses module selectors and partially implements lookup and diagnostics for them. The new functionality is hidden behind an -enable-experimental-module-selector frontend flag. There is one diagnostic regression with that flag enabled, but I've made sure that it keeps working when the diagnostic is disabled.

This work was previously in PR #28834, which was closed during the master-to-main transition. I've updated it to work on modern compilers, including removing some FIXMEs for bad diagnostics that have improved since December 2019.

Makes progress on rdar://problem/19481048.

@beccadax beccadax changed the title Module selectors Implement experimental module selectors (MyMod::someName) feature Nov 3, 2020
@beccadax beccadax force-pushed the mod-squad-2 branch 3 times, most recently from eb8ecdf to b6d41f6 Compare July 21, 2021 20:18
lib/Parse/ParseExpr.cpp Outdated Show resolved Hide resolved
beccadax and others added 19 commits August 6, 2021 12:37
# Conflicts:
#	test/NameLookup/module_selector.swift
This breaks some diagnostics in expr/primary/unqualified_name.swift; I’ll continue adding the feature and then revisit these to see how I can support them.
# Conflicts:
#	lib/Parse/ParseDecl.cpp
This is a first cut at how imports ought to adopt module selectors.
It will soon need to allocate sometimes.

# Conflicts:
#	lib/IDE/ExprContextAnalysis.cpp
# Conflicts:
#	lib/ClangImporter/ImportDecl.cpp
# Conflicts:
#	lib/AST/ASTScopeLookup.cpp
# Conflicts:
#	include/swift/AST/NameLookupRequests.h
#	lib/AST/ModuleNameLookup.cpp
# Conflicts:
#	lib/AST/UnqualifiedLookup.cpp
beccadax and others added 25 commits August 6, 2021 12:37
The history of this PR is actually a gigantic fiction and so some of the fix-it source locations are incorrect. Sorry about that.
# Conflicts:
#	lib/AST/UnqualifiedLookup.cpp
After nearly a year, the compiler has fixed a couple of bugs and changed a couple more diagnostics.
Another almost-year, another batch of diagnostic changes.
…to serialize module selectors.

This commit also changes the serialization format of @_specialize to serialize name information more simply. Instead of using a conditionally-biased argument count and an SPI group count, which could be inconsistent with the number of identifier IDs in the array, we use a kind field and SPI group count and calculate the argument count. This design seems easier to reason about, less likely to become inconsistent, and a little more compact on disk.
We weren't seeing diagnostics in some test cases because the bodies weren't being typechecked.
It makes sense that main::negate() would not be allowed because main does not re-export ModuleSelectorTestingKit.
• The same method is now always used to parse module selectors, whether or not they are valid
• A parameter to this method describes the reason for invalidity, and is used to generate its diagnostics.
• This also helps set up future changes
When a module selector does not start with an identifier, we often end up trying to parse whatever token it *does* have there as something else, which doesn't handle the module selector well. Correct this by speculatively parsing invalid selectors in various places.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant