From: Rui Ueyama Date: Sat, 23 Jul 2016 14:09:58 +0000 (+0000) Subject: Make a pure function a non-member file-scoped function. X-Git-Tag: llvmorg-4.0.0-rc1~14399 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36a153cd835a3b7c4c9ba5c688446217a8e388fa;p=platform%2Fupstream%2Fllvm.git Make a pure function a non-member file-scoped function. llvm-svn: 276524 --- diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 7c1a0ca..e140199 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -237,8 +237,7 @@ uint64_t ExprParser::parseExpr1(uint64_t Lhs, int MinPrec) { // Reads and evaluates an arithmetic expression. uint64_t ExprParser::parseExpr() { return parseExpr1(parsePrimary(), 0); } -template -bool LinkerScript::isDiscarded(InputSectionBase *S) { +template static bool isDiscarded(InputSectionBase *S) { return !S || !S->Live; } diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h index 0854ff6..3bab5bd 100644 --- a/lld/ELF/LinkerScript.h +++ b/lld/ELF/LinkerScript.h @@ -119,7 +119,6 @@ public: createSections(OutputSectionFactory &Factory); ArrayRef getFiller(StringRef Name); - bool isDiscarded(InputSectionBase *S); bool shouldKeep(InputSectionBase *S); void assignAddresses(ArrayRef *> S); int compareSections(StringRef A, StringRef B);