[llvm-objcopy][NFC] extract arg parsing logic to function

[keith]

Summary

This reduces a duplicate condition on tool type and removes a deeply
nested ternary.

Author: Keith Smiley <[e-mail]>

[jhenderson]

Looks good, with one suggestion.

Also, couple of notes about the summary:

1. Add [NFC] to the summary, as there is no functional change caused by this patch.
2. Tags tend to be in the form [llvm-objcopy] etc.

llvm/tools/llvm-objcopy/llvm-objcopy.cpp

336

Can you delete this enum too?

[keith]

Remove unused enum

[keith]

Thanks!

[alexander-shaposhnikov]

llvm/tools/llvm-objcopy/llvm-objcopy.cpp

66

nit: static (since this function is not used outside o llvm-objcopy.cpp)

[jhenderson]

In D89713#2341106, @jhenderson wrote:

Looks good, with one suggestion.

Also, couple of notes about the summary:

1. Add [NFC] to the summary, as there is no functional change caused by this patch.
2. Tags tend to be in the form [llvm-objcopy] etc.

Summary == patch/commit title, i.e. the full title should be "[llvm-objcopy][NFC] extract arg parsing logic to function" (or something like that).

[keith]

Make function static

[alexander-shaposhnikov]

LG, thanks!

llvm/tools/llvm-objcopy/llvm-objcopy.cpp

 StringRef ToolName;
 
 ErrorSuccess reportWarning(Error E) {
   assert(E);
   WithColor::warning(errs(), ToolName) << toString(std::move(E)) << '\n';
   return Error::success();
 }
 
+Expected<DriverConfig> getDriverConfig(ArrayRef<const char *> Args) {
+  StringRef Stem = sys::path::stem(ToolName);
+  auto Is = [=](StringRef Tool) {
+    // We need to recognize the following filenames:
+    //
+    // llvm-objcopy -> objcopy
+    // strip-10.exe -> strip
+    // powerpc64-unknown-freebsd13-objcopy -> objcopy
+    // llvm-install-name-tool -> install-name-tool
+    auto I = Stem.rfind_lower(Tool);
+    return I != StringRef::npos &&
+           (I + Tool.size() == Stem.size() || !isAlnum(Stem[I + Tool.size()]));
+  };
+
+  if (Is("bitcode-strip") || Is("bitcode_strip"))
+    return parseBitcodeStripOptions(Args);
+  else if (Is("strip"))
+    return parseStripOptions(Args, reportWarning);
+  else if (Is("install-name-tool") || Is("install_name_tool"))
+    return parseInstallNameToolOptions(Args);
+  else
+    return parseObjcopyOptions(Args, reportWarning);
+}
+
 } // end namespace objcopy
 } // end namespace llvm
 
 using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::objcopy;
 
 // For regular archives this function simply calls llvm::writeArchive,
if (Error E =
       return E;
   }
 
   return Error::success();
 }
 
 namespace {
 
 enum class ToolType { Objcopy, Strip, InstallNameTool, BitcodeStrip };
 
 } // anonymous namespace
 
 int main(int argc, char **argv) {
   InitLLVM X(argc, argv);
   ToolName = argv[0];
 
-  StringRef Stem = sys::path::stem(ToolName);
-  auto Is = [=](StringRef Tool) {
-    // We need to recognize the following filenames:
-    //
-    // llvm-objcopy -> objcopy
-    // strip-10.exe -> strip
-    // powerpc64-unknown-freebsd13-objcopy -> objcopy
-    // llvm-install-name-tool -> install-name-tool
-    auto I = Stem.rfind_lower(Tool);
-    return I != StringRef::npos &&
-           (I + Tool.size() == Stem.size() || !isAlnum(Stem[I + Tool.size()]));
-  };
-  ToolType Tool = ToolType::Objcopy;
-  if (Is("bitcode-strip") || Is("bitcode_strip"))
-    Tool = ToolType::BitcodeStrip;
-  else if (Is("strip"))
-    Tool = ToolType::Strip;
-  else if (Is("install-name-tool") || Is("install_name_tool"))
-    Tool = ToolType::InstallNameTool;
-
   // Expand response files.
   // TODO: Move these lines, which are copied from lib/Support/CommandLine.cpp,
   // into a separate function in the CommandLine library and call that function
   // here. This is duplicated code.
   SmallVector<const char *, 20> NewArgv(argv, argv + argc);
   BumpPtrAllocator A;
   StringSaver Saver(A);
   cl::ExpandResponseFiles(Saver,
                           Triple(sys::getProcessTriple()).isOSWindows()
                               ? cl::TokenizeWindowsCommandLine
                               : cl::TokenizeGNUCommandLine,
                           NewArgv);
 
   auto Args = makeArrayRef(NewArgv).drop_front();
-  Expected<DriverConfig> DriverConfig =
-      (Tool == ToolType::Strip)
-          ? parseStripOptions(Args, reportWarning)
-          : ((Tool == ToolType::InstallNameTool)
-                 ? parseInstallNameToolOptions(Args)
-                 : ((Tool == ToolType::BitcodeStrip)
-                        ? parseBitcodeStripOptions(Args)
-                        : parseObjcopyOptions(Args, reportWarning)));
+  Expected<DriverConfig> DriverConfig = getDriverConfig(Args);
+
   if (!DriverConfig) {
     logAllUnhandledErrors(DriverConfig.takeError(),
                           WithColor::error(errs(), ToolName));
     return 1;
   }
   for (CopyConfig &CopyConfig : DriverConfig->CopyConfigs) {
     if (Error E = executeObjcopy(CopyConfig)) {
       logAllUnhandledErrors(std::move(E), WithColor::error(errs(), ToolName));
       return 1;
     }
   }
 
   return 0;
 }