hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 01:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Swift: fix location extractor hitting swift assertion

Browse Source
This commit is contained in:
Paolo Tranquilli
2023-08-18 14:21:30 +02:00
parent c17a582b34
commit 386dedb9df
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
swift/extractor/infra/SwiftLocationExtractor.h
View File

@@ -40,7 +40,10 @@ concept HasSourceRangeOnly = requires(T e) {
&&(!HasStartAndEndLoc<T>)&&(!HasOneLoc<T>); &&(!HasStartAndEndLoc<T>)&&(!HasOneLoc<T>);
swift::SourceRange getSourceRange(const HasStartAndEndLoc auto& locatable) { swift::SourceRange getSourceRange(const HasStartAndEndLoc auto& locatable) {
return {locatable.getStartLoc(), locatable.getEndLoc()}; if (locatable.getStartLoc() && locatable.getEndLoc()) {
return {locatable.getStartLoc(), locatable.getEndLoc()};
}
return {};
} }
swift::SourceRange getSourceRange(const HasOneLoc auto& locatable) { swift::SourceRange getSourceRange(const HasOneLoc auto& locatable) {
@@ -64,7 +67,10 @@ swift::SourceRange getSourceRange(const llvm::MutableArrayRef<Locatable>& locata
} }
auto startRange = getSourceRange(locatables.front()); auto startRange = getSourceRange(locatables.front());
auto endRange = getSourceRange(locatables.back()); auto endRange = getSourceRange(locatables.back());
return {startRange.Start, endRange.End}; if (startRange.Start && endRange.End) {
return {startRange.Start, endRange.End};
}
return {};
} }
} // namespace detail } // namespace detail