Merge pull request #37133 from ahoppen/pr/serialize-text-module-symbolgraph

[SymbolGraph] Fix crasher when retrieving cursor info of method defined in ObjC

Author: ahoppen

lib/SymbolGraphGen/JSON.cpp

@@ -12,11 +12,15 @@
 // Adds Symbol Graph JSON serialization to other types.
 //===----------------------------------------------------------------------===//
 
+#include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
+#include "swift/AST/FileUnit.h"
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Type.h"
 #include "swift/AST/USRGeneration.h"
+#include "swift/ClangImporter/ClangModule.h"
+#include "swift/Serialization/SerializedModuleLoader.h"
 #include "JSON.h"
 
 void swift::symbolgraphgen::serialize(const llvm::VersionTuple &VT,
@@ -128,6 +132,39 @@ void swift::symbolgraphgen::serialize(const swift::GenericTypeParamType *Param,
   });
 }
 
+void swift::symbolgraphgen::serialize(const ModuleDecl &Module,
+                                      llvm::json::OStream &OS,
+                                      llvm::Triple Target) {
+  auto *MainFile = Module.getFiles().front();
+  switch (MainFile->getKind()) {
+  case FileUnitKind::Builtin:
+    llvm_unreachable("Unexpected module kind: Builtin");
+  case FileUnitKind::DWARFModule:
+    llvm_unreachable("Unexpected module kind: DWARFModule");
+  case FileUnitKind::Synthesized:
+    llvm_unreachable("Unexpected module kind: Synthesized");
+    break;
+  case FileUnitKind::Source:
+    serialize(Module.getASTContext().LangOpts.Target, OS);
+    break;
+  case FileUnitKind::SerializedAST: {
+    auto SerializedAST = cast<SerializedASTFile>(MainFile);
+    auto Target = llvm::Triple(SerializedAST->getTargetTriple());
+    serialize(Target, OS);
+    break;
+  }
+  case FileUnitKind::ClangModule: {
+    auto ClangModule = cast<ClangModuleUnit>(MainFile);
+    if (const auto *Overlay = ClangModule->getOverlayModule()) {
+      serialize(*Overlay, OS, Target);
+    } else {
+      serialize(Target, OS);
+    }
+    break;
+  }
+  }
+}
+
 void
 swift::symbolgraphgen::filterGenericParams(
     TypeArrayView<GenericTypeParamType> GenericParams,

lib/SymbolGraphGen/JSON.h

@@ -43,6 +43,7 @@ void serialize(const llvm::Triple &T, llvm::json::OStream &OS);
 void serialize(const ExtensionDecl *Extension, llvm::json::OStream &OS);
 void serialize(const Requirement &Req, llvm::json::OStream &OS);
 void serialize(const swift::GenericTypeParamType *Param, llvm::json::OStream &OS);
+void serialize(const ModuleDecl &M, llvm::json::OStream &OS, llvm::Triple Target);
 
 void filterGenericParams(
     TypeArrayView<GenericTypeParamType> GenericParams,

lib/SymbolGraphGen/SymbolGraph.cpp

@@ -17,9 +17,7 @@
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/USRGeneration.h"
 #include "swift/Basic/Version.h"
-#include "swift/ClangImporter/ClangModule.h"
 #include "swift/Sema/IDETypeChecking.h"
-#include "swift/Serialization/SerializedModuleLoader.h"
 
 #include "DeclarationFragmentPrinter.h"
 #include "FormatVersion.h"
@@ -530,38 +528,7 @@ void SymbolGraph::serialize(llvm::json::OStream &OS) {
       }
       AttributeRAII Platform("platform", OS);
 
-      auto *MainFile = M.getFiles().front();
-      switch (MainFile->getKind()) {
-          case FileUnitKind::Builtin:
-            llvm_unreachable("Unexpected module kind: Builtin");
-          case FileUnitKind::DWARFModule:
-            llvm_unreachable("Unexpected module kind: DWARFModule");
-          case FileUnitKind::Synthesized:
-            llvm_unreachable("Unexpected module kind: Synthesized");
-            break;
-          case FileUnitKind::Source:
-            symbolgraphgen::serialize(M.getASTContext().LangOpts.Target, OS);
-            break;
-          case FileUnitKind::SerializedAST: {
-            auto SerializedAST = cast<SerializedASTFile>(MainFile);
-            auto Target = llvm::Triple(SerializedAST->getTargetTriple());
-            symbolgraphgen::serialize(Target, OS);
-            break;
-          }
-          case FileUnitKind::ClangModule: {
-            auto ClangModule = cast<ClangModuleUnit>(MainFile);
-            if (const auto *Overlay = ClangModule->getOverlayModule()) {
-              auto &OverlayMainFile =
-                  Overlay->getMainFile(FileUnitKind::SerializedAST);
-              auto SerializedAST = cast<SerializedASTFile>(OverlayMainFile);
-              auto Target = llvm::Triple(SerializedAST.getTargetTriple());
-              symbolgraphgen::serialize(Target, OS);
-            } else {
-              symbolgraphgen::serialize(Walker.Options.Target, OS);
-            }
-            break;
-        }
-      }
+      symbolgraphgen::serialize(M, OS, Walker.Options.Target);
     });
 
     if (ModuleVersion) {

test/SourceKit/CursorInfo/Inputs/mixed_framework/MixedFramework.framework/Headers/MixedFramework.h

@@ -0,0 +1,3 @@
+@interface MyObjcType
+- (void)foo;
+@end

test/SourceKit/CursorInfo/Inputs/mixed_framework/MixedFramework.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module MixedFramework {
+  umbrella header "MixedFramework.h"
+
+  export *
+  module * { export * }
+}

test/SourceKit/CursorInfo/mixed_framework.swift

@@ -0,0 +1,9 @@
+// RUN: %empty-directory(%t.mcp)
+
+public class MySwiftType {
+    public func bar(x: MyObjcType) {
+// Check that we don't crash
+// RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):11 -req-opts=retrieve_symbol_graph=1 %s -- -module-name MixedFramework -F %S/Inputs/mixed_framework -import-underlying-module -module-cache-path %t.mcp %s
+        x.foo()
+    }
+}