Skip to content

Commit cef12d7

Browse files
authored
Merge pull request #2907 from swiftwasm/main
[pull] swiftwasm from main
2 parents 27f3c4a + 98323f1 commit cef12d7

9 files changed

+186
-181
lines changed

include/swift/Option/Options.td

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,7 @@ def profile_stats_entities: Flag<["-"], "profile-stats-entities">,
304304
HelpText<"Profile changes to stats in -stats-output-dir, subdivided by source entity">;
305305

306306
def emit_dependencies : Flag<["-"], "emit-dependencies">,
307-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
308-
SupplementaryOutput]>,
307+
Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput]>,
309308
HelpText<"Emit basic Make-compatible dependencies files">;
310309
def track_system_dependencies : Flag<["-"], "track-system-dependencies">,
311310
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>,
@@ -348,17 +347,14 @@ def embed_tbd_for_module : Separate<["-"], "embed-tbd-for-module">,
348347
HelpText<"Embed symbols from the module in the emitted tbd file">;
349348

350349
def serialize_diagnostics : Flag<["-"], "serialize-diagnostics">,
351-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
352-
SupplementaryOutput]>,
350+
Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput]>,
353351
HelpText<"Serialize diagnostics in a binary format">;
354352
def serialize_diagnostics_path : Separate<["-"], "serialize-diagnostics-path">,
355-
Flags<[FrontendOption, NoBatchOption, DoesNotAffectIncrementalBuild,
356-
ArgumentIsPath, SupplementaryOutput]>,
353+
Flags<[FrontendOption, NoBatchOption, ArgumentIsPath, SupplementaryOutput]>,
357354
HelpText<"Emit a serialized diagnostics file to <path>">,
358355
MetaVarName<"<path>">;
359356
def serialize_diagnostics_path_EQ: Joined<["-"], "serialize-diagnostics-path=">,
360-
Flags<[FrontendOption, NoBatchOption, DoesNotAffectIncrementalBuild,
361-
ArgumentIsPath, SupplementaryOutput]>,
357+
Flags<[FrontendOption, NoBatchOption, ArgumentIsPath, SupplementaryOutput]>,
362358
Alias<serialize_diagnostics_path>;
363359
def color_diagnostics : Flag<["-"], "color-diagnostics">,
364360
Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
@@ -430,48 +426,45 @@ def module_abi_name : Separate<["-"], "module-abi-name">,
430426
HelpText<"ABI name to use for the contents of this module">;
431427

432428
def emit_module : Flag<["-"], "emit-module">,
433-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
434-
SupplementaryOutput]>,
429+
Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput]>,
435430
HelpText<"Emit an importable module">;
436431
def emit_module_path : Separate<["-"], "emit-module-path">,
437-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
438-
ArgumentIsPath, SupplementaryOutput]>,
432+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
433+
SupplementaryOutput]>,
439434
HelpText<"Emit an importable module to <path>">,
440435
MetaVarName<"<path>">;
441436
def emit_module_path_EQ : Joined<["-"], "emit-module-path=">,
442-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
443-
ArgumentIsPath, SupplementaryOutput]>,
437+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
438+
SupplementaryOutput]>,
444439
Alias<emit_module_path>;
445440

446441
def emit_module_summary :
447442
Flag<["-"], "emit-module-summary">,
448-
Flags<[NoInteractiveOption, DoesNotAffectIncrementalBuild,
449-
SupplementaryOutput]>,
443+
Flags<[NoInteractiveOption, SupplementaryOutput]>,
450444
HelpText<"Output module summary file">;
451445
def emit_module_summary_path :
452446
Separate<["-"], "emit-module-summary-path">,
453-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
454-
ArgumentIsPath, SupplementaryOutput]>,
447+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
448+
SupplementaryOutput]>,
455449
MetaVarName<"<path>">, HelpText<"Output module summary file to <path>">;
456450
def module_summary_path : Separate<["-"], "module-summary-path">,
457451
Flags<[FrontendOption, ArgumentIsPath]>, MetaVarName<"<path>">,
458452
HelpText<"Combined module summary file <path>">;
459453

460454
def emit_module_interface :
461455
Flag<["-"], "emit-module-interface">,
462-
Flags<[NoInteractiveOption, DoesNotAffectIncrementalBuild,
463-
SupplementaryOutput]>,
456+
Flags<[NoInteractiveOption, SupplementaryOutput]>,
464457
HelpText<"Output module interface file">;
465458
def emit_module_interface_path :
466459
Separate<["-"], "emit-module-interface-path">,
467-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
468-
ArgumentIsPath, SupplementaryOutput]>,
460+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
461+
SupplementaryOutput]>,
469462
MetaVarName<"<path>">, HelpText<"Output module interface file to <path>">;
470463

471464
def emit_private_module_interface_path :
472465
Separate<["-"], "emit-private-module-interface-path">,
473466
Flags<[FrontendOption, NoInteractiveOption, HelpHidden,
474-
DoesNotAffectIncrementalBuild, ArgumentIsPath, SupplementaryOutput]>,
467+
ArgumentIsPath, SupplementaryOutput]>,
475468
MetaVarName<"<path>">, HelpText<"Output private module interface file to <path>">;
476469

477470
def verify_emitted_module_interface :
@@ -490,28 +483,26 @@ def avoid_emit_module_source_info :
490483

491484
def emit_module_source_info_path :
492485
Separate<["-"], "emit-module-source-info-path">,
493-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
494-
ArgumentIsPath, SupplementaryOutput]>,
486+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
487+
SupplementaryOutput]>,
495488
MetaVarName<"<path>">, HelpText<"Output module source info file to <path>">;
496489

497490
def emit_parseable_module_interface :
498491
Flag<["-"], "emit-parseable-module-interface">,
499492
Alias<emit_module_interface>,
500-
Flags<[NoInteractiveOption, HelpHidden, DoesNotAffectIncrementalBuild,
501-
SupplementaryOutput]>;
493+
Flags<[NoInteractiveOption, HelpHidden, SupplementaryOutput]>;
502494
def emit_parseable_module_interface_path :
503495
Separate<["-"], "emit-parseable-module-interface-path">,
504496
Alias<emit_module_interface_path>,
505-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
506-
HelpHidden, ArgumentIsPath, SupplementaryOutput]>;
497+
Flags<[FrontendOption, NoInteractiveOption, HelpHidden, ArgumentIsPath,
498+
SupplementaryOutput]>;
507499

508500
def emit_objc_header : Flag<["-"], "emit-objc-header">,
509-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
510-
SupplementaryOutput]>,
501+
Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput]>,
511502
HelpText<"Emit an Objective-C header file">;
512503
def emit_objc_header_path : Separate<["-"], "emit-objc-header-path">,
513-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
514-
ArgumentIsPath, SupplementaryOutput]>,
504+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
505+
SupplementaryOutput]>,
515506
MetaVarName<"<path>">, HelpText<"Emit an Objective-C header file to <path>">;
516507

517508
def static : Flag<["-"], "static">,
@@ -1202,13 +1193,12 @@ def disable_autolinking_runtime_compatibility_dynamic_replacements
12021193
"compatibility library">;
12031194

12041195
def emit_symbol_graph: Flag<["-"], "emit-symbol-graph">,
1205-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
1206-
SupplementaryOutput, HelpHidden]>,
1196+
Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput, HelpHidden]>,
12071197
HelpText<"Emit a symbol graph">;
12081198

12091199
def emit_symbol_graph_dir : Separate<["-"], "emit-symbol-graph-dir">,
1210-
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
1211-
ArgumentIsPath, SupplementaryOutput, HelpHidden]>,
1200+
Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath,
1201+
SupplementaryOutput, HelpHidden]>,
12121202
HelpText<"Emit a symbol graph to directory <dir>">,
12131203
MetaVarName<"<dir>">;
12141204

0 commit comments

Comments
 (0)