From: Rui Ueyama <ruiu@google.com>
Date: Thu, 28 Apr 2016 02:08:54 +0000 (+0000)
Subject: Do not call hasArg and getLastArg for the same option.
X-Git-Tag: llvmorg-3.9.0-rc1~7654
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d7a3d011d0a1120c4c020b02fe33a6fd4cf0dee;p=platform%2Fupstream%2Fllvm.git

Do not call hasArg and getLastArg for the same option.

llvm-svn: 267839
---

diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index b6d1d4c..fd7dbc2 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -86,7 +86,7 @@ struct Configuration {
   bool Threads;
   bool Trace;
   bool Verbose;
-  bool VersionScript;
+  bool VersionScript = false;
   bool WarnCommon;
   bool ZExecStack;
   bool ZNodelete;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index a88d804..5d638a8 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -394,19 +394,18 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
   for (auto *Arg : Args.filtered(OPT_undefined))
     Config->Undefined.push_back(Arg->getValue());
 
-  if (Args.hasArg(OPT_dynamic_list))
-    if (Optional<MemoryBufferRef> Buffer =
-            readFile(getString(Args, OPT_dynamic_list)))
+  if (auto *Arg = Args.getLastArg(OPT_dynamic_list))
+    if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
       parseDynamicList(*Buffer);
 
   for (auto *Arg : Args.filtered(OPT_export_dynamic_symbol))
     Config->DynamicList.push_back(Arg->getValue());
 
-  Config->VersionScript = Args.hasArg(OPT_version_script);
-  if (Config->VersionScript)
-    if (Optional<MemoryBufferRef> Buffer =
-            readFile(getString(Args, OPT_version_script)))
+  if (auto *Arg = Args.getLastArg(OPT_version_script)) {
+    Config->VersionScript = true;
+    if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
       parseVersionScript(*Buffer);
+  }
 }
 
 void LinkerDriver::createFiles(opt::InputArgList &Args) {