[ClangImporter] don't add swift_attr files to a module's auxiliary files #65867
Conversation
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
rdar://107624995
QuietMisdreavus
requested review from
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci Please test |
bnbarham
reviewed
May 12, 2023
lib/AST/Module.cpp
Outdated
| for (auto *sourceFile : AuxiliaryFiles) | ||
| sourceFileLocationMap->allSourceFiles.push_back(sourceFile); | ||
| for (auto *sourceFile : AuxiliaryFiles) { | ||
| if (sourceFile->getBufferID()) |
There was a problem hiding this comment.
This is the only use of AuxiliaryFiles and in general it doesn't really make sense to me to have an auxiliary file without a backing buffer. IMO we should just not add the auxiliary file in getClangSwiftAttrSourceFile.
QuietMisdreavus
requested review from
zoecarver,
hyp and
egorzhdan
as code owners
|
@swift-ci Please test |
QuietMisdreavus
changed the title
|
@swift-ci Please clean test macOS |
|
@swift-ci Please smoke test |
bnbarham
approved these changes
May 16, 2023
|
@swift-ci Please smoke test Linux |
QuietMisdreavus
added a commit
that referenced
this pull request
May 17, 2023
…les (#65867) rdar://107624995
meg-gupta
pushed a commit
to meg-gupta/swift
that referenced
this pull request
May 22, 2023
…les (swiftlang#65867) rdar://107624995
NuriAmari
pushed a commit
to NuriAmari/swift
that referenced
this pull request
May 28, 2023
…les (swiftlang#65867) rdar://107624995
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves rdar://107624995
The source-file location map used to determine which source files correspond to which locations assumes that all the source files used in the comparison have backing buffers. This holds for regular library files and macro expansions, but when Objective-C code with
__attribute__((swift_attr))attributes is imported, the attributes get a fake source file with no backing buffer added to the module's auxiliary files.When SourceEntityWalker tries to determine whether a source location corresponds to a macro expansion, it uses this file map to look up a corresponding source file. When a module contains imported Objective-C code with
swift_attrattributes as well as a Swift extension of that type, an empty optional containing the file's buffer ID is unwrapped, causing a crash. This is consistently triggered by SymbolGraphGen, as it is one of the major users of SourceEntityWalker.This PR updates the source-file location map to skip auxiliary files that don't have a backing buffer, the same as the module's regular files.