[ms] [llvm-ml] Allow the /Zs parameter as a synonym for -filetype=null

[epastor]

Summary

For ml.exe, /Zs implies a syntax check with no output files.

[epastor]

Rebase on HEAD

[epastor]

Rebase on HEAD

[epastor]

Rebase on parent

[thakis]

The unrelated change looks a) unrelated b) incorrect.

No test?

Can we drop -filetype=nul now that we have this?

llvm/tools/llvm-ml/llvm-ml.cpp

77 ↗

(On Diff #303187)

mention this change in cl description, add test for it

....but I don't think this change is correct?

C:\src>ml64 foo.asm /c /foasdf.obj /nologo
Microsoft (R) Macro Assembler (x64) Version 14.25.28614.0
Copyright (C) Microsoft Corporation.  All rights reserved.

 Assembling: foo.asm
MASM : warning A4018:invalid command-line option : /foasdf.obj

[epastor]

Rebase on parent

[epastor]

Rebase on parent

[epastor]

llvm/tools/llvm-ml/llvm-ml.cpp

77 ↗

(On Diff #303187)

This is correcting us to match ml64; we previously considered /fo equivalent to /Fo, but this was a mistake. However, I'll push it up the stack to the change that introduced the problem instead.

[epastor]

Rebase on parent

[epastor]

Rebase on parent

[epastor]

Rebase on parent

[thakis]

Still no test, as far as I can tell. I think the suggestion below turns this into a 3-line diff (+ test).

llvm/tools/llvm-ml/Opts.td

30

Instead of all the DerivedArgList changes below, doesn't just saying ..., Alias<filetype>, AliasArgs<"none"> here do the same thing?

[epastor]

Use AliasArgs to simplify

[epastor]

Fix errors in Alias/AliasArgs use, and add tests

[epastor]

In D90061#2431150, @thakis wrote:

Still no test, as far as I can tell. I think the suggestion below turns this into a 3-line diff (+ test).

Tests added, thanks.

llvm/tools/llvm-ml/Opts.td

30

... yes, and I didn't know that was an option. Fixed - though it did require me to move these below the LLVM-style args, so we could successfully alias it to one of them.

Thanks, this is much better!

[thakis]

v nice :)

llvm/test/tools/llvm-ml/parse_only.asm

+; RUN: llvm-ml %s /Zs /Fo - | FileCheck %s
+
+.code
+
+t1 PROC
+  ECHO Testing!
+  ret
+t1 ENDP
+
+; check for the .text symbol (appears in both object files & .s output)
+; CHECK-NOT: .text
+
+; CHECK: Testing!
+
+; check for the .text symbol (appears in both object files & .s output)
+; CHECK-NOT: .text
+
+end

llvm/test/tools/llvm-ml/parse_only_errors.asm

+; RUN: not llvm-ml %s /Zs /Fo - 2>&1 | FileCheck %s
+
+.code
+
+t1 PROC
+  blah
+  ret
+t1 ENDP
+
+; check for the .text symbol (appears in both object files & .s output)
+; CHECK-NOT: .text
+
+; CHECK: error: invalid instruction mnemonic 'blah'
+
+; check for the .text symbol (appears in both object files & .s output)
+; CHECK-NOT: .text
+
+end

llvm/tools/llvm-ml/Opts.td

class UnsupportedFlag<string name> : Flag<["/", "-"], name>,
                                      Group<unsupported_Group>;
 class UnsupportedJoined<string name> : Joined<["/", "-"], name>,
                                        Group<unsupported_Group>;
 class UnsupportedJoinedOrSeparate<string name> :
         JoinedOrSeparate<["/", "-"], name>, Group<unsupported_Group>;
 class UnsupportedSeparate<string name> : Separate<["/", "-"], name>,
                                          Group<unsupported_Group>;
 
-def help : MLFlag<"?">,
-           HelpText<"Display available options">;
-def help_long : MLFlag<"help">, Alias<help>;
-def assemble_only : MLFlag<"c">, HelpText<"Assemble only; do not link">;
-def define : MLJoinedOrSeparate<"D">, MetaVarName<"<macro>=<value>">,
-             HelpText<"Define <macro> to <value> (or blank if <value> "
-                      "omitted)">;
-def output_file : MLJoinedOrSeparate<"Fo">, HelpText<"Names the output file">;
-def include_path : MLJoinedOrSeparate<"I">,
-                   HelpText<"Sets path for include files">;
-def safeseh : MLFlag<"safeseh">,
-              HelpText<"Mark resulting object files as either containing no "
-                       "exception handlers or containing exception handlers "
-                       "that are all declared with .SAFESEH. Only available in "
-                       "32-bit.">;
-def assembly_file : MLJoinedOrSeparate<"Ta">,
-                    HelpText<"Assemble source file with name not ending with "
-                             "the .asm extension">;
-
 def bitness : LLVMJoined<"m">, Values<"32,64">,
               HelpText<"Target platform (x86 or x86-64)">;
 def as_lex : LLVMFlag<"as-lex">,
              HelpText<"Lex tokens from a .asm file without assembling">;
 def filetype : LLVMJoined<"filetype=">, Values<"obj,s,null">,
                HelpText<"Emit a file with the given type">;
 def output_att_asm : LLVMFlag<"output-att-asm">,
                      HelpText<"Use ATT syntax for output assembly">;
 def show_encoding : LLVMFlag<"show-encoding">,
                     HelpText<"Show instruction encodings in output assembly">;
 def show_inst : LLVMFlag<"show-inst">,
                 HelpText<"Show internal instruction representation in output "
                          "assembly">;
 def show_inst_operands : LLVMFlag<"show-inst-operands">,
                          HelpText<"Show instructions operands as parsed">;
 def print_imm_hex : LLVMFlag<"print-imm-hex">,
                     HelpText<"Prefer hex format for immediate values in output "
                              "assembly">;
 def preserve_comments : LLVMFlag<"preserve-comments">,
                         HelpText<"Preserve comments in output assembly">;
 def save_temp_labels : LLVMFlag<"save-temp-labels">,
                        HelpText<"Don't discard temporary labels">;
 
+def help : MLFlag<"?">,
+           HelpText<"Display available options">;
+def help_long : MLFlag<"help">, Alias<help>;
+def assemble_only : MLFlag<"c">, HelpText<"Assemble only; do not link">;
+def define : MLJoinedOrSeparate<"D">, MetaVarName<"<macro>=<value>">,
+             HelpText<"Define <macro> to <value> (or blank if <value> "
+                      "omitted)">;
+def output_file : MLJoinedOrSeparate<"Fo">, HelpText<"Names the output file">;
+def include_path : MLJoinedOrSeparate<"I">,
+                   HelpText<"Sets path for include files">;
+def safeseh : MLFlag<"safeseh">,
+              HelpText<"Mark resulting object files as either containing no "
+                       "exception handlers or containing exception handlers "
+                       "that are all declared with .SAFESEH. Only available in "
+                       "32-bit.">;
+def assembly_file : MLJoinedOrSeparate<"Ta">,
+                    HelpText<"Assemble source file with name not ending with "
+                             "the .asm extension">;
+def parse_only : MLFlag<"Zs">, HelpText<"Run a syntax-check only">,
+                 Alias<filetype>, AliasArgs<["null"]>;
+
 def tiny_model_support : UnsupportedFlag<"AT">, HelpText<"">;
 def alternate_linker : UnsupportedJoined<"Bl">, HelpText<"">;
 def coff_object_file : UnsupportedFlag<"coff">, HelpText<"">;
 def preserve_identifier_case : UnsupportedFlag<"Cp">, HelpText<"">;
 def uppercase_identifiers : UnsupportedFlag<"Cu">, HelpText<"">;
 def preserve_extern_case : UnsupportedFlag<"Cx">, HelpText<"">;
 def output_preprocessed : UnsupportedFlag<"EP">, HelpText<"">;
 def errorreport : UnsupportedJoined<"ERRORREPORT">, HelpText<"">;

 def warning_level : UnsupportedJoined<"W">, HelpText<"">;
 def error_on_warning : UnsupportedFlag<"WX">, HelpText<"">;
 def ignore_include_envvar : UnsupportedFlag<"X">, HelpText<"">;
 def line_number_info : UnsupportedFlag<"Zd">, HelpText<"">;
 def export_all_symbols : UnsupportedFlag<"Zf">, HelpText<"">;
 def codeview_info : UnsupportedFlag<"Zi">, HelpText<"">;
 def enable_m510_option : UnsupportedFlag<"Zm">, HelpText<"">;
 def structure_packing : UnsupportedJoined<"Zp">, HelpText<"">;
-def parse_only : UnsupportedFlag<"Zs">, HelpText<"">;