averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that SourceFiles always have a backing buffer in the SourceManager

Browse Source 
The "buffer ID" in a SourceFile, which is used to find the source file's
contents in the SourceManager, has always been optional. However, the
effectively every SourceFile actually does have a buffer ID, and the
vast majority of accesses to this information dereference the optional
without checking.

Update the handful of call sites that provided `nullopt` as the buffer
ID to provide a proper buffer instead. These were mostly unit tests
and testing programs, with a few places that passed a never-empty
optional through to the SourceFile constructor.

Then, remove optionality from the representation and accessors. It is
now the case that every SourceFile has a buffer ID, simplying a bunch
of code.
This commit is contained in:
Doug Gregor
2024-09-16 21:32:41 -07:00
parent 4e7fb73b0c
commit 49aa0e966f
41 changed files with 100 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
View File

@@ -1628,7 +1628,7 @@ static void resolveCursor(
}
SourceManager &SM = CompIns.getSourceMgr();
unsigned BufferID = SF->getBufferID().value();
unsigned BufferID = SF->getBufferID();
SourceLoc Loc =
Lexer::getLocForStartOfToken(SM, BufferID, Offset);
if (Loc.isInvalid()) {
@@ -1802,7 +1802,7 @@ static void computeDiagnostics(
: Receiver(Receiver) {}
void handlePrimaryAST(ASTUnitRef AstUnit) override {
unsigned BufferID = *AstUnit->getPrimarySourceFile().getBufferID();
unsigned BufferID = AstUnit->getPrimarySourceFile().getBufferID();
auto &DiagConsumer = AstUnit->getEditorDiagConsumer();
auto Diagnostics = DiagConsumer.getDiagnosticsForBuffer(BufferID);
Receiver(RequestResult<DiagnosticsResult>::fromResult(Diagnostics));
@@ -1863,7 +1863,7 @@ static void resolveName(
}
SourceLoc Loc = Lexer::getLocForStartOfToken(CompIns.getSourceMgr(),
*SF->getBufferID(), Offset);
SF->getBufferID(), Offset);
if (Loc.isInvalid()) {
Receiver(RequestResult<NameTranslatingInfo>::fromError(
"Unable to resolve the start of the token."));
@@ -2548,7 +2548,7 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
// FIXME: Don't silently eat errors here.
RelatedIdentsResult getRelatedIdents(SourceFile *SrcFile,
CompilerInstance &CompInst) {
unsigned BufferID = SrcFile->getBufferID().value();
unsigned BufferID = SrcFile->getBufferID();
SourceLoc Loc = Lexer::getLocForStartOfToken(CompInst.getSourceMgr(),
BufferID, Offset);
if (Loc.isInvalid())
@@ -2722,7 +2722,7 @@ void SwiftLangSupport::findActiveRegionsInFile(
}
auto &SM = SF->getASTContext().SourceMgr;
auto BufferID = *SF->getBufferID();
auto BufferID = SF->getBufferID();
SmallVector<IfConfigInfo> Configs;
for (auto &range : SF->getIfConfigClauseRanges()) {
@@ -2812,7 +2812,7 @@ void SwiftLangSupport::semanticRefactoring(
return;
}
Opts.Range.BufferID = *SF->getBufferID();
Opts.Range.BufferID = SF->getBufferID();
Opts.Range.Line = Info.Line;
Opts.Range.Column = Info.Column;
Opts.Range.Length = Info.Length;
@@ -2963,7 +2963,7 @@ void SwiftLangSupport::collectVariableTypes(
SourceRange Range;
if (Offset.has_value() && Length.has_value()) {
auto &SM = CompInst.getSourceMgr();
unsigned BufferID = SF->getBufferID().value();
unsigned BufferID = SF->getBufferID();
SourceLoc Start = Lexer::getLocForStartOfToken(SM, BufferID, *Offset);
SourceLoc End =
Lexer::getLocForStartOfToken(SM, BufferID, *Offset + *Length);