Revise #file changes from SE-0274 #32700
Conversation
beccadax
added
the
swift evolution pending discussion
|
@swift-ci test |
|
@swift-ci test source compatibility |
|
Build failed |
beccadax
force-pushed
the
magical-and-evolutionary
branch
2 times, most recently
from
c9183b4 to
47d04cc
Compare
|
@swift-ci test |
|
Build failed |
|
Build failed |
|
@swift-ci test |
|
Build failed |
|
@swift-ci test |
|
Build failed |
|
@swift-ci test macOS platform |
|
Build failed |
|
Build failed |
|
With swiftlang/swift-syntax#226 @swift-ci please smoke test |
|
With swiftlang/swift-syntax#226 @swift-ci please smoke test |
beccadax
force-pushed
the
magical-and-evolutionary
branch
from
47d04cc to
c966e7b
Compare
|
(Just toggled "Draft" state to get GitHub to notice that my force-push had cleared the merge conflict. Sorry about the noise.) |
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
With swiftlang/swift-syntax#226 @swift-ci please build toolchain Linux platform |
| FilePath, | ||
| FileIDSpelledAsFile, | ||
| FilePathSpelledAsFile, |
There was a problem hiding this comment.
Any reason we cannot use MagicIdentifierKinds.def here and related functions in Serialization?
Also, while you are here, could you align the order of this enum with swift::DefaultArgumentKind?
There was a problem hiding this comment.
Serialization usually defines its own copies of enums like this so that it's more obvious that you'll need to bump SWIFTMODULE_VERSION_MINOR.
I suppose I can change the order.
There was a problem hiding this comment.
Ah, I see. Thank you for the explanation :)
There was a problem hiding this comment.
Ordering change is in the latest force push (along with another bump of SWIFTMODULE_VERSION_MINOR).
There was a problem hiding this comment.
Hm? I don't see the aligned ordering in the diff.
There was a problem hiding this comment.
The order used to be:
FileID,
FilePath,
FileIDSpelledAsFile,
FilePathSpelledAsFile,
It's now:
FileID,
FileIDSpelledAsFile,
FilePath,
FilePathSpelledAsFile,
There's no commit showing the change between the old and new ordering because I also had to rebase the pull request when ModuleFormat.h changed out from under me, but it has been corrected.
There was a problem hiding this comment.
Ahh, sorry. I meant this whole enum. For example Inherited should be after Normal, File et al should be after StoredProperty. That's is not super important, but this is a good opportunity to do it.
Tweak this test to only look for debug info references to the filename, not *any* reference to the filename.
The meaning of EnableConcisePoundFile is going to shift slightly, so it makes sense to always include #filePath in completions. Also, @rintaro confirmed that this should be using KeywordKind::pound_filePath, not KeywordKind::pound_file.
Extracts the list of magic identifier literal kinds into a separate file and updates a lot of code to use macro metaprogramming instead of naming half a dozen cases manually. This is a complicated change, but it should be NFC.
Doing this NFC renaming first helps clarify the functional changes to come.
…and modify resolveFileIDConflicts() to diagnose any such violations instead of asserting. Swift does not allow any two files in the same module to have the same filename, even if they are in different directories. However, this is enforced in the driver, so tests that invoke the frontend directly can violate it. Turns out that a couple of those snuck into the test suite at various points. This commit updates those tests. It also causes the frontend to diagnose the duplicate filename error just as the driver would have, which should help us understand what happened more easily if this crops up again in the future. NFC, since invoking the frontend directly is unsupported.
This temporarily breaks -enable-experimental-concise-pound-file. fixup adding #fileID
Such as force unwraps, as! casts, etc.
In -swift-version 5 and earlier, #file will continue to be a synonym for #filePath; in a future -swift-version (“Swift 6 mode”), it will become a synonym for #fileID. #file in libraries will be interpreted according to the language mode the library was compiled in, not the language mode its client uses. Implement this behavior, tied to a frontend flag instead of a language version. We do so by splitting the old `MagicIdentifierLiteralExprKind::File` into two separate cases, `FileIDSpelledAsFile` and `FilePathSpelledAsFile`, and propagating this distinction throughout the AST. This seems cleaner than looking up the setting for the module the declaration belongs to every time we see `File`. This doesn’t handle module interfaces yet; we’ll take care of those in a separate commit.
Add -experimental-enable-concise-pound-file to the list of flags preserved by module interfaces, so that when we rebuild an interface, it comes out the same way as the original file.
This change makes: * #file compatible with #fileID in “Swift 6 mode” * #file compatible with #filePath and #fileID in Swift 5 mode * #file in Swift 5 mode code compatible with #file in “Swift 6 mode” code This should keep anyone from seeing XCTAssert-wrapping noise until they adopt “Swift 6 mode” (whatever version that ends up actually being).
We ultimately want to explicitly change standard library uses of #file to #fileID, but once we do, previous compilers won’t be able to build the standard library. So instead, we will temporarily build the standard library with -enable-experimental-concise-pound-file, which should have the same effect, but will back-deploy to compilers going back several months.
beccadax
force-pushed
the
magical-and-evolutionary
branch
from
60bac94 to
87d3d3e
Compare
|
@swift-ci please test |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
With swiftlang/swift-syntax#226 @swift-ci please test |
theblixguy
added
swift evolution approved
|
Build failed |
|
With swiftlang/swift-syntax#226 @swift-ci please test Linux platform |
As per swiftlang#32700, this is only meant for `Swift.swiftinterface`. Addresses rdar://143152066
As per swiftlang#32700, this is only meant for `Swift.swiftinterface`. Addresses rdar://143152066
This PR implements the changes discussed in the follow-up thread to SE-0274 (now SE-0285). Specifically, it:
Fixes several tests which previously violated the same-filename rule, but got away with it because they were directly calling the frontend. Also tightens up a test previously introduced by [NFC] GenericSignatureImpl: Spell conformsToProtocol & getConformsTo in terms of requirements #31734 so that it merely ensures filenames don't end up in SIL debug info, rather than in the SIL file at all.
Refactors a lot of magic identifier literal implementation to be driven by a new
MagicIdentifierKinds.deffile.MagicIdentifierLiteralExpr::Kindand some cases ofDefaultArgumentKindare now driven by this table, as is much logic that simply propagates these kinds without changing them; it also specifies tokens related to magic identifier literals, so parsing and code completion now work from this file too. (It also fixes a bug in#filePath's code completion support, which was previously disabled and untested.)Adds a new
#fileIDliteral which always generates the concise file ID string.Splits
MagicIdentifierLiteralExpr::Kind::File(and similar cases elsewhere) intoFilePathSpelledAsFileandFileIDSpelledAsFile. When-enable-experimental-concise-pound-fileis false, the parser generates the former, producing current Swift 5 behavior; when it is true, the parser generates the latter, producing future "Swift 6" behavior. The rest of the compiler (including module interface emission, by preserving the compiler flag) propagates this difference so that Swift 5 declarations can be used from Swift 6 code and vice-versa without confusion. This design causes more code changes, but is less risky than alternatives.Introduces a concept of "compatibility" to the
diag::default_magic_identifier_mismatchdiagnostic. If two magic identifiers are compatible, the diagnostic is suppressed. Compatibility is commutative. Every magic identifier is compatible with itself; Swift 6#fileis compatible with#fileID, while Swift 5#fileis compatible with#fileID,#filePath, and Swift 6#file.Makes both compiler-generated traps and standard library diagnostics use file IDs instead of file paths. In the standard library, this is temporarily being done by building with
-enable-experimental-concise-pound-file, which is supported by compilers since Shorten #file and add #filePath (behind an experimental flag) #25656 in late December, rather than by actually writing#fileID, which is introduced in this change. This is merely to give updated tools time to spread; I intend to remove the flag and write#fileIDin the future.Fixes rdar://65113871 and SR-12936.