[lld] r325952 - Handle --version before handling --mllvm.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Fri Feb 23 12:24:28 PST 2018


Author: ruiu
Date: Fri Feb 23 12:24:28 2018
New Revision: 325952

URL: http://llvm.org/viewvc/llvm-project?rev=325952&view=rev
Log:
Handle --version before handling --mllvm.

Because it's a waste of time to handle --mllvm before --version.

Differential Revision: https://reviews.llvm.org/D43527

Modified:
    lld/trunk/wasm/Driver.cpp

Modified: lld/trunk/wasm/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Driver.cpp?rev=325952&r1=325951&r2=325952&view=diff
==============================================================================
--- lld/trunk/wasm/Driver.cpp (original)
+++ lld/trunk/wasm/Driver.cpp Fri Feb 23 12:24:28 2018
@@ -233,6 +233,12 @@ void LinkerDriver::link(ArrayRef<const c
     return;
   }
 
+  // Handle --version
+  if (Args.hasArg(OPT_version) || Args.hasArg(OPT_v)) {
+    outs() << getLLDVersion() << "\n";
+    return;
+  }
+
   // Parse and evaluate -mllvm options.
   std::vector<const char *> V;
   V.push_back("wasm-ld (LLVM option parsing)");
@@ -242,11 +248,6 @@ void LinkerDriver::link(ArrayRef<const c
 
   errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
 
-  if (Args.hasArg(OPT_version) || Args.hasArg(OPT_v)) {
-    outs() << getLLDVersion() << "\n";
-    return;
-  }
-
   Config->AllowUndefined = Args.hasArg(OPT_allow_undefined);
   Config->CheckSignatures =
       Args.hasFlag(OPT_check_signatures, OPT_no_check_signatures, false);




More information about the llvm-commits mailing list