-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Fix crash in merge-modules involving a file with extension of nested type #35809
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
Merged
CodaFi
merged 1 commit into
swiftlang:main
from
akyrtzi:74062542-crash-extension-nested-type
Feb 9, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
validation-test/Serialization/Inputs/crash-nested-extension/f1.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
public class MyCls { | ||
public static func doIt(_: Inner1.Inner2) {} | ||
|
||
public struct Inner1 {} | ||
} |
3 changes: 3 additions & 0 deletions
3
validation-test/Serialization/Inputs/crash-nested-extension/f2.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
public extension MyCls.Inner1 { | ||
struct Inner2 {} | ||
} |
13 changes: 13 additions & 0 deletions
13
validation-test/Serialization/Inputs/crash-nested-extension/output.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"./f1.swift": { | ||
"swift-dependencies": "./f1.swiftdeps", | ||
"swiftmodule": "./f1~partial.swiftmodule" | ||
}, | ||
"./f2.swift": { | ||
"swift-dependencies": "./f2.swiftdeps", | ||
"swiftmodule": "./f2~partial.swiftmodule" | ||
}, | ||
"": { | ||
"swift-dependencies": "./main~buildrecord.swiftdeps" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// RUN: %empty-directory(%t) | ||
// RUN: cp -r %S/Inputs/crash-nested-extension/* %t | ||
// RUN: cd %t | ||
// RUN: %swiftc_driver -output-file-map %t/output.json -incremental ./f1.swift ./f2.swift -module-name MyMod -j1 -disable-batch-mode -emit-module -emit-module-path MyMod.swiftmodule -v | ||
|
||
// RUN: %empty-directory(%t) | ||
// RUN: cp -r %S/Inputs/crash-nested-extension/* %t | ||
// RUN: cd %t | ||
// RUN: %swiftc_driver -output-file-map %t/output.json -incremental -Xfrontend -experimental-skip-all-function-bodies -Xfrontend -experimental-allow-module-with-compiler-errors ./f1.swift ./f2.swift -module-name MyMod -j1 -disable-batch-mode -emit-module -emit-module-path MyMod.swiftmodule -v |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes me nervous since we can now set up a cross-ref that causes resolution to re-enter itself - especially through a name lookup. This was the cause of a ton of circular lookup problems in the SDK when we were refactoring the clang importer. Lazy member loading no longer has re-entrancy guards in it to catch this too...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't a circular issue be detected in the frontend invocations before reaching merge-modules?
But regardless, it looks to me that this particular code-path follows the strict
xref
path components, so it's going to reach the end of the lookup by definition.