[llvm-size] Reject unknown radix values

[eush]

Summary

This addresses https://bugs.llvm.org/show_bug.cgi?id=39403 by making
-radix en enumeration option with 8, 10, and 16 as the only accepted
values.

[jhenderson]

Code change is fine, but please add a test to show that an unknown value is rejected with a useful error message.

[eush]

Added a test.

[jhenderson]

LGTM with the suggested changes in the CHECK command names.

test/tools/llvm-size/unknown-radix.test

3

Don't use a CHECK prefix with "NOT" in it, to avoid confusion with the "CHECK-NOT:" FileCheck directive. You don't even need "CHECK" in fact, so you could just label them "NON-NUMERIC" and "NUMERIC" or similar.

[eush]

Renamed CHECK command names as suggested.

[jhenderson]

Great, thanks. Do you need me to commit it for you?

[eush]

@jhenderson Yes, I do :)

test/tools/llvm-size/unknown-radix.test

+RUN: not llvm-size -radix=foo 2>&1 | FileCheck --check-prefix=NON-NUMERIC %s
+NON-NUMERIC: {{.*}}llvm-size{{(\.EXE|\.exe)?}}: for the -radix option: Cannot find option named 'foo'!
+
+RUN: not llvm-size -radix=4 2>&1 | FileCheck --check-prefix=NUMERIC %s
+NUMERIC: {{.*}}llvm-size{{(\.EXE|\.exe)?}}: for the -radix option: Cannot find option named '4'!

tools/llvm-size/llvm-size.cpp

ELFCommons("common",
                cl::init(false));
 
 static cl::list<std::string>
 ArchFlags("arch", cl::desc("architecture(s) from a Mach-O file to dump"),
           cl::ZeroOrMore);
 static bool ArchAll = false;
 
 enum RadixTy { octal = 8, decimal = 10, hexadecimal = 16 };
-static cl::opt<unsigned int>
-Radix("radix", cl::desc("Print size in radix. Only 8, 10, and 16 are valid"),
-      cl::init(decimal));
+static cl::opt<RadixTy> Radix(
+    "radix", cl::desc("Print size in radix"), cl::init(decimal),
+    cl::values(clEnumValN(octal, "8", "Print size in octal"),
+               clEnumValN(decimal, "10", "Print size in decimal"),
+               clEnumValN(hexadecimal, "16", "Print size in hexadecimal")));
 
 static cl::opt<RadixTy>
 RadixShort(cl::desc("Print size in radix:"),
            cl::values(clEnumValN(octal, "o", "Print size in octal"),
                       clEnumValN(decimal, "d", "Print size in decimal"),
                       clEnumValN(hexadecimal, "x", "Print size in hexadecimal")),
            cl::init(decimal));
 

 int main(int argc, char **argv) {
   InitLLVM X(argc, argv);
   cl::ParseCommandLineOptions(argc, argv, "llvm object size dumper\n");
 
   ToolName = argv[0];
   if (OutputFormatShort.getNumOccurrences())
     OutputFormat = static_cast<OutputFormatTy>(OutputFormatShort);
   if (RadixShort.getNumOccurrences())
-    Radix = RadixShort;
+    Radix = RadixShort.getValue();
 
   for (unsigned i = 0; i < ArchFlags.size(); ++i) {
     if (ArchFlags[i] == "all") {
       ArchAll = true;
     } else {
       if (!MachOObjectFile::isValidArch(ArchFlags[i])) {
         outs() << ToolName << ": for the -arch option: Unknown architecture "
                << "named '" << ArchFlags[i] << "'";