Allow for emission of swift.extension symbols for extensions to external types in SymbolGraphGen

include/swift/Option/Options.td

@@ -1351,6 +1351,11 @@ def pretty_print: Flag<["-"], "pretty-print">,
   Flags<[SwiftAPIExtractOption, SwiftSymbolGraphExtractOption]>,
   HelpText<"Pretty-print the output JSON">;
 
+def emit_extension_block_symbols: Flag<["-"], "emit-extension-block-symbols">,
+  Flags<[SwiftSymbolGraphExtractOption, FrontendOption,
+        NoInteractiveOption, SupplementaryOutput, HelpHidden]>,
+  HelpText<"Emit 'swift.extension' symbols for extensions to external types instead of directly associating members and conformances with the extended nominal when generating symbol graphs">;
+
 // swift-symbolgraph-extract-only options
 def output_dir : Separate<["-"], "output-dir">,
   Flags<[NoDriverOption, SwiftSymbolGraphExtractOption, SwiftAPIDigesterOption,

include/swift/SymbolGraphGen/SymbolGraphOptions.h

@@ -48,6 +48,11 @@ struct SymbolGraphOptions {
 
   /// Whether to include documentation for clang nodes or not.
   bool IncludeClangDocs = false;
+
+  /// Whether to emit "swift.extension" symbols for extensions to external types
+  /// along with "extensionTo" relationships instead of directly associating
+  /// members and conformances with the extended nominal.
+  bool EmitExtensionBlockSymbols = false;
 };
 
 } // end namespace symbolgraphgen

lib/Driver/ToolChains.cpp

@@ -616,6 +616,7 @@ ToolChain::constructInvocation(const CompileJobAction &job,
     context.Args.AddLastArg(Arguments, options::OPT_emit_symbol_graph_dir);
   }
   context.Args.AddLastArg(Arguments, options::OPT_include_spi_symbols);
+  context.Args.AddLastArg(Arguments, options::OPT_emit_extension_block_symbols);
   context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_minimum_access_level);
 
   return II;
@@ -1112,6 +1113,7 @@ ToolChain::constructInvocation(const MergeModuleJobAction &job,
   context.Args.AddLastArg(Arguments, options::OPT_emit_symbol_graph);
   context.Args.AddLastArg(Arguments, options::OPT_emit_symbol_graph_dir);
   context.Args.AddLastArg(Arguments, options::OPT_include_spi_symbols);
+  context.Args.AddLastArg(Arguments, options::OPT_emit_extension_block_symbols);
   context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_minimum_access_level);
 
   context.Args.AddLastArg(Arguments, options::OPT_import_objc_header);

lib/DriverTool/swift_symbolgraph_extract_main.cpp

@@ -172,6 +172,7 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args,
       ParsedArgs.hasArg(OPT_skip_inherited_docs),
       ParsedArgs.hasArg(OPT_include_spi_symbols),
       /*IncludeClangDocs=*/false,
+      ParsedArgs.hasArg(OPT_emit_extension_block_symbols),
   };
 
   if (auto *A = ParsedArgs.getLastArg(OPT_minimum_access_level)) {

lib/Frontend/CompilerInvocation.cpp

@@ -1284,6 +1284,8 @@ static void ParseSymbolGraphArgs(symbolgraphgen::SymbolGraphOptions &Opts,
 
   Opts.SkipInheritedDocs = Args.hasArg(OPT_skip_inherited_docs);
   Opts.IncludeSPISymbols = Args.hasArg(OPT_include_spi_symbols);
+  Opts.EmitExtensionBlockSymbols =
+      Args.hasArg(OPT_emit_extension_block_symbols);
 
   if (auto *A = Args.getLastArg(OPT_symbol_graph_minimum_access_level)) {
     Opts.MinimumAccessLevel =

lib/SymbolGraphGen/Edge.h

@@ -104,7 +104,20 @@ struct RelationshipKind {
   static inline RelationshipKind OptionalRequirementOf() {
     return RelationshipKind { "optionalRequirementOf" };
   }
-
+
+  /**
+   A symbol A extends a symbol B with members or conformances.
+
+   This relationship describes the connection between extension blocks
+   (swift.extension symbols) and the type they extend.
+
+   The implied inverse of this relationship is a symbol B that is extended
+   by an extension block symbol A.
+   */
+  static inline RelationshipKind ExtensionTo() {
+    return RelationshipKind{"extensionTo"};
+  }
+
   bool operator==(const RelationshipKind &Other) const {
     return Name == Other.Name;
   }

lib/SymbolGraphGen/FormatVersion.h

@@ -14,7 +14,7 @@
 #define SWIFT_SYMBOLGRAPHGEN_FORMATVERSION_H
 
 #define SWIFT_SYMBOLGRAPH_FORMAT_MAJOR 0
-#define SWIFT_SYMBOLGRAPH_FORMAT_MINOR 5
-#define SWIFT_SYMBOLGRAPH_FORMAT_PATCH 3
+#define SWIFT_SYMBOLGRAPH_FORMAT_MINOR 6
+#define SWIFT_SYMBOLGRAPH_FORMAT_PATCH 0
 
 #endif // SWIFT_SYMBOLGRAPHGEN_FORMATVERSION_H

lib/SymbolGraphGen/JSON.cpp

@@ -12,6 +12,8 @@
 // Adds Symbol Graph JSON serialization to other types.
 //===----------------------------------------------------------------------===//
 
+#include "JSON.h"
+#include "Symbol.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/FileUnit.h"
@@ -21,7 +23,6 @@
 #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,
                                       llvm::json::OStream &OS) {
@@ -69,6 +70,8 @@ void swift::symbolgraphgen::serialize(const ExtensionDecl *Extension,
       if (const auto *ExtendedModule = ExtendedNominal->getModuleContext()) {
         OS.attribute("extendedModule", ExtendedModule->getNameStr());
       }
+
+      OS.attribute("typeKind", Symbol::getKind(ExtendedNominal).first);
     }
 
     SmallVector<Requirement, 4> FilteredRequirements;