Skip to content

Commit b848793

Browse files
[Caching] Move frontend-parseable-output into cache invariant group
`frontend-parseable-output` related options only affects diagnostics and should be cache invariant. This also fixes the bug that xcbuild can sometimes modify this argument from execution pipeline, causing cache key to change. rdar://120552768
1 parent 7150e54 commit b848793

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/swift/Option/FrontendOptions.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ def backup_module_interface_path_EQ :
7777
Joined<["-"], "backup-module-interface-path=">,
7878
Alias<backup_module_interface_path>;
7979

80+
def frontend_parseable_output : Flag<["-"], "frontend-parseable-output">,
81+
HelpText<"Emit textual output in a parseable format">;
82+
8083
} // end let Flags = [FrontendOption, NoDriverOption, CacheInvariant]
8184

8285
def primary_file : Separate<["-"], "primary-file">,
@@ -87,9 +90,6 @@ let Flags = [FrontendOption, NoDriverOption] in {
8790

8891
def triple : Separate<["-"], "triple">, Alias<target>;
8992

90-
def frontend_parseable_output : Flag<["-"], "frontend-parseable-output">,
91-
HelpText<"Emit textual output in a parseable format">;
92-
9393
def emit_module_doc : Flag<["-"], "emit-module-doc">,
9494
HelpText<"Emit a module documentation file based on documentation "
9595
"comments">;

include/swift/Option/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ def emit_module_dependencies_path:
18011801

18021802
def use_frontend_parseable_output:
18031803
Flag<["-"], "use-frontend-parseable-output">,
1804-
Flags<[HelpHidden, NewDriverOnlyOption]>,
1804+
Flags<[HelpHidden, NewDriverOnlyOption, CacheInvariant]>,
18051805
HelpText<"Emit parseable-output from swift-frontend jobs instead of from "
18061806
"the driver">;
18071807

0 commit comments

Comments
 (0)