[lld] r290150 - Inline a small function.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Mon Dec 19 17:34:32 PST 2016


Author: ruiu
Date: Mon Dec 19 19:34:31 2016
New Revision: 290150

URL: http://llvm.org/viewvc/llvm-project?rev=290150&view=rev
Log:
Inline a small function.

Modified:
    lld/trunk/ELF/Driver.cpp

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=290150&r1=290149&r2=290150&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Mon Dec 19 19:34:31 2016
@@ -479,9 +479,10 @@ static SortSectionPolicy getSortKind(opt
 }
 
 static std::vector<StringRef> getLines(MemoryBufferRef MB) {
-  std::vector<StringRef> Ret;
   SmallVector<StringRef, 0> Arr;
   MB.getBuffer().split(Arr, '\n');
+
+  std::vector<StringRef> Ret;
   for (StringRef S : Arr) {
     S = S.trim();
     if (!S.empty())
@@ -500,15 +501,6 @@ static void parseSymbolOrderingList(Memo
     Config->SymbolOrderingFile.insert({S, I++});
 }
 
-// Parse the --retain-symbols-file argument. File has form:
-// symbolName1
-// [...]
-// symbolNameN
-static void parseRetainSymbolsList(MemoryBufferRef MB) {
-  for (StringRef S : getLines(MB))
-    Config->RetainSymbolsFile.insert(S);
-}
-
 // Initializes Config members by the command line options.
 void LinkerDriver::readConfigs(opt::InputArgList &Args) {
   for (auto *Arg : Args.filtered(OPT_L))
@@ -660,7 +652,8 @@ void LinkerDriver::readConfigs(opt::Inpu
   if (auto *Arg = Args.getLastArg(OPT_retain_symbols_file)) {
     Config->Discard = DiscardPolicy::RetainFile;
     if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-      parseRetainSymbolsList(*Buffer);
+      for (StringRef S : getLines(*Buffer))
+        Config->RetainSymbolsFile.insert(S);
   }
 
   for (auto *Arg : Args.filtered(OPT_export_dynamic_symbol))




More information about the llvm-commits mailing list