Skip to content

Commit b8ab5d5

Browse files
committed
Set driver options for frontend too and propagate them in compiler invocation
1 parent eed54bb commit b8ab5d5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

include/swift/Option/Options.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,11 +1780,11 @@ def emit_symbol_graph_dir : Separate<["-"], "emit-symbol-graph-dir">,
17801780
MetaVarName<"<dir>">;
17811781

17821782
def symbol_graph_pretty_print: Flag<["-"], "symbol-graph-pretty-print">,
1783-
Flags<[NoInteractiveOption, HelpHidden]>,
1783+
Flags<[FrontendOption, NoInteractiveOption, HelpHidden, SupplementaryOutput]>,
17841784
HelpText<"Pretty-print the output symbol graph JSON">;
17851785

17861786
def symbol_graph_skip_synthesized_members: Flag<["-"], "symbol-graph-skip-synthesized-members">,
1787-
Flags<[NoInteractiveOption, HelpHidden]>,
1787+
Flags<[FrontendOption, NoInteractiveOption, HelpHidden, SupplementaryOutput]>,
17881788
HelpText<"Skip members inherited through classes or default implementations">;
17891789

17901790
def symbol_graph_minimum_access_level: Separate<["-"], "symbol-graph-minimum-access-level">,

lib/Driver/ToolChains.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,8 @@ ToolChain::constructInvocation(const CompileJobAction &job,
706706
context.Args.AddLastArg(Arguments, options::OPT_emit_extension_block_symbols,
707707
options::OPT_omit_extension_block_symbols);
708708
context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_minimum_access_level);
709+
context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_skip_synthesized_members);
710+
context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_pretty_print);
709711

710712
return II;
711713
}

lib/Frontend/CompilerInvocation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,8 +2283,8 @@ static void ParseSymbolGraphArgs(symbolgraphgen::SymbolGraphOptions &Opts,
22832283
}
22842284

22852285
// default values for generating symbol graphs during a build
2286-
Opts.PrettyPrint = false;
2287-
Opts.EmitSynthesizedMembers = true;
2286+
Opts.PrettyPrint = Args.hasArg(OPT_symbol_graph_pretty_print);
2287+
Opts.EmitSynthesizedMembers = !Args.hasArg(OPT_symbol_graph_skip_synthesized_members);
22882288
Opts.PrintMessages = false;
22892289
Opts.IncludeClangDocs = false;
22902290
}

0 commit comments

Comments
 (0)