Merge pull request #71227 from ahoppen/ahoppen/related-idents-self

[SourceKit] Fix a crash when performing related identiifers request on `self`

Author: ahoppen

test/SourceKit/RelatedIdents/self.swift

@@ -0,0 +1,9 @@
+struct Test {
+  func foo() {
+// RUN: %sourcekitd-test -req=related-idents -pos=%(line + 1):6 %s -- %s | %FileCheck %s
+    self
+  }
+}
+
+// CHECK: START RANGES
+// CHECK-NEXT: END RANGES

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -792,10 +792,10 @@ struct RelatedIdentInfo {
 /// Result of `findRelatedIdentifiersInFile`.
 struct RelatedIdentsResult {
   SmallVector<RelatedIdentInfo, 8> RelatedIdents;
-  std::string OldName;
+  std::optional<std::string> OldName;
 
   RelatedIdentsResult(SmallVector<RelatedIdentInfo, 8> RelatedIdents,
-                      std::string OldName)
+                      std::optional<std::string> OldName)
       : RelatedIdents(RelatedIdents), OldName(OldName) {}
 
   static RelatedIdentsResult empty() { return RelatedIdentsResult({}, ""); }

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp

@@ -2550,7 +2550,10 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
 
       RenameLocs Locs = localRenameLocs(SrcFile, Info->VD);
 
-      std::string OldName = Locs.getLocations().front().OldName.str();
+      std::optional<std::string> OldName;
+      if (!Locs.getLocations().empty()) {
+        OldName = Locs.getLocations().front().OldName.str();
+      }
 #ifndef NDEBUG
       for (auto loc : Locs.getLocations()) {
         assert(loc.OldName == OldName &&

tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

@@ -2903,7 +2903,9 @@ static void findRelatedIdents(StringRef PrimaryFilePath,
           Elem.set(KeyLength, R.Length);
           Elem.set(KeyNameType, renameLocUsageUID(R.Usage));
         }
-        RespBuilder.getDictionary().set(KeyName, Info.OldName);
+        if (Info.OldName) {
+          RespBuilder.getDictionary().set(KeyName, *Info.OldName);
+        }
 
         Rec(RespBuilder.createResponse());
       });