From: George Rimar Date: Tue, 3 Apr 2018 12:06:29 +0000 (+0000) Subject: [ELF] - Simplify createFiles. NFCI. X-Git-Tag: llvmorg-7.0.0-rc1~9130 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfbeecdc5dfab7485dfe44b8a86638253c7e6f47;p=platform%2Fupstream%2Fllvm.git [ELF] - Simplify createFiles. NFCI. Groups paired options together. Differential revision: https://reviews.llvm.org/D45090 llvm-svn: 329060 --- diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 4565fde..df9f32a 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -879,7 +879,8 @@ static bool getBinaryOption(StringRef S) { void LinkerDriver::createFiles(opt::InputArgList &Args) { for (auto *Arg : Args) { - switch (Arg->getOption().getUnaliasedOption().getID()) { + unsigned ID = Arg->getOption().getUnaliasedOption().getID(); + switch (ID) { case OPT_library: addLibrary(Arg->getValue()); break; @@ -902,25 +903,19 @@ void LinkerDriver::createFiles(opt::InputArgList &Args) { error(Twine("cannot find linker script ") + Arg->getValue()); break; case OPT_as_needed: - Config->AsNeeded = true; + case OPT_no_as_needed: + Config->AsNeeded = (ID == OPT_as_needed); break; case OPT_format: InBinary = getBinaryOption(Arg->getValue()); break; - case OPT_no_as_needed: - Config->AsNeeded = false; - break; case OPT_Bstatic: - Config->Static = true; - break; case OPT_Bdynamic: - Config->Static = false; + Config->Static = (ID == OPT_Bstatic); break; case OPT_whole_archive: - InWholeArchive = true; - break; case OPT_no_whole_archive: - InWholeArchive = false; + InWholeArchive = (ID == OPT_whole_archive); break; case OPT_just_symbols: if (Optional MB = readFile(Arg->getValue())) { @@ -929,10 +924,8 @@ void LinkerDriver::createFiles(opt::InputArgList &Args) { } break; case OPT_start_lib: - InLib = true; - break; case OPT_end_lib: - InLib = false; + InLib = (ID == OPT_start_lib); break; } }