Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2024-07-11 16:35:36 -07:00
34 changed files with 68 additions and 71 deletions

View File

@@ -2099,7 +2099,7 @@ void SwiftLangSupport::getCursorInfo(
} else {
std::string Diagnostic; // Unused.
ResolvedValueRefCursorInfoPtr Info = new ResolvedValueRefCursorInfo(
/*SourcFile=*/nullptr, SourceLoc(),
/*SourceFile=*/nullptr, SourceLoc(),
const_cast<ValueDecl *>(Entity.Dcl),
/*CtorTyRef=*/nullptr,
/*ExtTyRef=*/nullptr, Entity.IsRef,
@@ -2585,7 +2585,7 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
#ifndef NDEBUG
for (auto loc : Locs.getLocations()) {
assert(loc.OldName == OldName &&
"Found related identfiers with different names?");
"Found related identifiers with different names?");
}
#endif