Create tests for the two new symbol graph options

Add options to the driver and frontend options

Author: cmcgee1024

include/swift/Frontend/FrontendOptions.h

@@ -573,6 +573,12 @@ class FrontendOptions {
   /// Whether to include symbols with SPI information in the symbol graph.
   bool IncludeSPISymbolsInSymbolGraph = false;
 
+  /// Whether to pretty print the JSON output.
+  bool PrettyPrint = false;
+
+  ///Whether to emit synthesized members in the JSON output.
+  bool EmitSynthesizedMembers = true;
+
   /// Whether to reuse a frontend (i.e. compiler instance) for multiple
   /// compilations. This prevents ASTContext being freed.
   bool ReuseFrontendForMultipleCompilations = false;

lib/Driver/ToolChains.cpp

@@ -706,6 +706,8 @@ ToolChain::constructInvocation(const CompileJobAction &job,
   context.Args.AddLastArg(Arguments, options::OPT_emit_extension_block_symbols,
                           options::OPT_omit_extension_block_symbols);
   context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_minimum_access_level);
+  context.Args.AddLastArg(Arguments, options::OPT_pretty_print);
+  context.Args.AddLastArg(Arguments, options::OPT_skip_synthesized_members);
 
   return II;
 }
@@ -1223,6 +1225,8 @@ ToolChain::constructInvocation(const MergeModuleJobAction &job,
   addOutputsOfType(Arguments, context.Output, context.Args, file_types::TY_TBD,
                    "-emit-tbd-path");
 
+  context.Args.AddLastArg(Arguments, options::OPT_pretty_print);
+  context.Args.AddLastArg(Arguments, options::OPT_skip_synthesized_members);
   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);

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -420,6 +420,9 @@ bool ArgsToFrontendOptionsConverter::convert(
   Opts.SkipInheritedDocs = Args.hasArg(OPT_skip_inherited_docs);
   Opts.IncludeSPISymbolsInSymbolGraph = Args.hasArg(OPT_include_spi_symbols);
 
+  Opts.PrettyPrint = Args.hasArg(OPT_pretty_print);
+  Opts.EmitSynthesizedMembers = !Args.hasArg(OPT_skip_synthesized_members);
+
   Opts.Static = Args.hasArg(OPT_static);
 
   Opts.HermeticSealAtLink = Args.hasArg(OPT_experimental_hermetic_seal_at_link);

lib/Frontend/CompilerInvocation.cpp

@@ -2257,6 +2257,9 @@ static void ParseSymbolGraphArgs(symbolgraphgen::SymbolGraphOptions &Opts,
       Args.hasFlag(OPT_emit_extension_block_symbols,
                    OPT_omit_extension_block_symbols, /*default=*/false);
 
+  Opts.PrettyPrint = Args.hasArg(OPT_pretty_print);
+  Opts.EmitSynthesizedMembers = !Args.hasArg(OPT_skip_synthesized_members);
+
   if (auto *A = Args.getLastArg(OPT_symbol_graph_minimum_access_level)) {
     Opts.MinimumAccessLevel =
         llvm::StringSwitch<AccessLevel>(A->getValue())
@@ -2283,8 +2286,6 @@ static void ParseSymbolGraphArgs(symbolgraphgen::SymbolGraphOptions &Opts,
   }
 
   // default values for generating symbol graphs during a build
-  Opts.PrettyPrint = Args.hasArg(OPT_pretty_print);
-  Opts.EmitSynthesizedMembers = !Args.hasArg(OPT_skip_synthesized_members);
   Opts.PrintMessages = false;
   Opts.IncludeClangDocs = false;
 }

test/SymbolGraph/EmitWhileBuilding.swift

@@ -33,16 +33,25 @@
 // now run with -symbol-graph-minimum-access-level to change the available symbols
 
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -module-name EmitWhileBuilding -emit-module -emit-module-path %t/EmitWhileBuilding.swiftmodule -emit-symbol-graph -emit-symbol-graph-dir %t/ -symbol-graph-minimum-access-level private
+// -skip-synthesized-members
+// RUN: %target-build-swift %s -module-name EmitWhileBuilding -emit-module -emit-module-path %t/EmitWhileBuilding.swiftmodule -pretty-print -skip-synthesized-members -emit-symbol-graph -emit-symbol-graph-dir %t/ -symbol-graph-minimum-access-level private
 // RUN: %FileCheck %s --input-file %t/EmitWhileBuilding.symbols.json
 // RUN: %FileCheck %s --input-file %t/EmitWhileBuilding.symbols.json --check-prefix PRIV
+// Check that the JSON has been pretty printed with some indented lines (FIXME - the pretty-print flag isn't working)
+// RUN: cat %t/EmitWhileBuilding.symbols.json | jq | grep '^  '
 
 /// Does a foo.
 public func foo() {}
 
 /// Does a bar.
 func bar() {}
 
-// CHECK: "precise":"s:17EmitWhileBuilding3fooyyF"
-// PUB-NOT: "precise":"s:17EmitWhileBuilding3baryyF"
-// PRIV: "precise":"s:17EmitWhileBuilding3baryyF"
+/// Has a compiler synthesized symbol
+public struct Baz: Hashable {
+    let foo: Int
+}
+
+// CHECK: "precise": "s:17EmitWhileBuilding3fooyyF"
+// PUB-NOT: "precise": "s:17EmitWhileBuilding3baryyF"
+// PUB-NOT: "precise": "s:SQsE2neoiySbx_xtFZ::SYNTHESIZED::s:17EmitWhileBuilding3BazV",
+// PRIV: "precise": "s:17EmitWhileBuilding3baryyF"