From 5a5132a8f60700c4631c03371035dd337a5ff708 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 2 May 2019 10:49:27 +0000 Subject: [PATCH] [llvm-readobj] Delete and inline relocAddressLess It is used only once in COFFDumper.cpp. Deleting it from the public interface seems better. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359775 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-readobj/COFFDumper.cpp | 4 +++- tools/llvm-readobj/llvm-readobj.cpp | 4 ---- tools/llvm-readobj/llvm-readobj.h | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/llvm-readobj/COFFDumper.cpp b/tools/llvm-readobj/COFFDumper.cpp index e8db76f791c..62f2fc56b56 100644 --- a/tools/llvm-readobj/COFFDumper.cpp +++ b/tools/llvm-readobj/COFFDumper.cpp @@ -592,7 +592,9 @@ void COFFDumper::cacheRelocations() { RelocMap[Section].push_back(Reloc); // Sort relocations by address. - llvm::sort(RelocMap[Section], relocAddressLess); + llvm::sort(RelocMap[Section], [](RelocationRef L, RelocationRef R) { + return L.getOffset() < R.getOffset(); + }); } } diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp index d4feda4cc64..89fddc7233c 100644 --- a/tools/llvm-readobj/llvm-readobj.cpp +++ b/tools/llvm-readobj/llvm-readobj.cpp @@ -386,10 +386,6 @@ void error(std::error_code EC) { reportError(EC.message()); } -bool relocAddressLess(RelocationRef a, RelocationRef b) { - return a.getOffset() < b.getOffset(); -} - } // namespace llvm static void reportError(StringRef Input, Error Err) { diff --git a/tools/llvm-readobj/llvm-readobj.h b/tools/llvm-readobj/llvm-readobj.h index 500d7295e69..54318b29676 100644 --- a/tools/llvm-readobj/llvm-readobj.h +++ b/tools/llvm-readobj/llvm-readobj.h @@ -43,8 +43,6 @@ namespace llvm { OS.flush(); reportError(Buf); } - bool relocAddressLess(object::RelocationRef A, - object::RelocationRef B); } // namespace llvm namespace opts { -- 2.40.0