commit c9f402eadc02d52371abb286790a0d4600e4b2d0
author Rui Ueyama <ruiu@google.com> Fri Apr 22 00:23:52 2016 +0000
committer Rui Ueyama <ruiu@google.com> Fri Apr 22 00:23:52 2016 +0000
tree c987c6a535480907f24e3adfd5d25995ba50ebfc
parent d513ad88d590a29169a4108a9279c9f8708642b2

Inline SectionRule::match.

This short function was used only once and didn't provide much value.

llvm-svn: 267086

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 43d8022..9fcb2f61 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -165,7 +165,7 @@
 template <class ELFT>
 StringRef LinkerScript<ELFT>::getOutputSection(InputSectionBase<ELFT> *S) {
   for (SectionRule &R : Opt.Sections)
-    if (R.match(S))
+    if (matchStr(R.SectionPattern, S->getSectionName()))
       return R.Dest;
   return "";
 }
@@ -296,10 +296,6 @@
   }
 }
 
-template <class ELFT> bool SectionRule::match(InputSectionBase<ELFT> *S) {
-  return matchStr(SectionPattern, S->getSectionName());
-}
-
 class elf::ScriptParser : public ScriptParserBase {
   typedef void (ScriptParser::*Handler)();
 

lld/ELF/LinkerScript.h

diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h
index 5c07e7f..dfffb98 100644
--- a/lld/ELF/LinkerScript.h
+++ b/lld/ELF/LinkerScript.h
@@ -28,8 +28,7 @@
 template <class ELFT> class OutputSectionBase;
 
 // This class represents each rule in SECTIONS command.
-class SectionRule {
-public:
+struct SectionRule {
   SectionRule(StringRef D, StringRef S)
       : Dest(D), SectionPattern(S) {}
 
@@ -38,7 +37,6 @@
 
   StringRef Dest;
 
-private:
   StringRef SectionPattern;
 };
 
@@ -90,7 +88,6 @@
   ScriptConfiguration &Opt = *ScriptConfig;
 
   int getSectionIndex(StringRef Name);
-  SectionRule *find(InputSectionBase<ELFT> *S);
 
   uint64_t evaluate(ArrayRef<StringRef> Tokens);
   uint64_t parseExpr(ArrayRef<StringRef> &Tokens);