diff options
| author | sebmarchand <sebmarchand@chromium.org> | 2015-08-11 12:25:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-11 19:26:52 +0000 |
| commit | f61492754fc9ce2234ed05f34483e1f60498f155 (patch) | |
| tree | f5754085f27b1bd6f6966032706571d0f8a81358 /courgette | |
| parent | a7fc1264e00391787a5c473255c39d4bfbd4bc90 (diff) | |
| download | chromium_src-f61492754fc9ce2234ed05f34483e1f60498f155.zip chromium_src-f61492754fc9ce2234ed05f34483e1f60498f155.tar.gz chromium_src-f61492754fc9ce2234ed05f34483e1f60498f155.tar.bz2 | |
Courgette: Remove 2 duplicates calls to std::sort.
There's already a call to std::sort at the end of ParseRelocs. It's a small improvement, but it's still better than nothing :)
BUG=
Review URL: https://codereview.chromium.org/1284733002
Cr-Commit-Position: refs/heads/master@{#342865}
Diffstat (limited to 'courgette')
| -rw-r--r-- | courgette/disassembler_win32_x64.cc | 2 | ||||
| -rw-r--r-- | courgette/disassembler_win32_x64_unittest.cc | 2 | ||||
| -rw-r--r-- | courgette/disassembler_win32_x86.cc | 2 | ||||
| -rw-r--r-- | courgette/disassembler_win32_x86_unittest.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/courgette/disassembler_win32_x64.cc b/courgette/disassembler_win32_x64.cc index 6f35ca5..58e787b 100644 --- a/courgette/disassembler_win32_x64.cc +++ b/courgette/disassembler_win32_x64.cc @@ -372,8 +372,6 @@ bool DisassemblerWin32X64::ParseAbs32Relocs() { if (!ParseRelocs(&abs32_locations_)) return false; - std::sort(abs32_locations_.begin(), abs32_locations_.end()); - #if COURGETTE_HISTOGRAM_TARGETS for (size_t i = 0; i < abs32_locations_.size(); ++i) { RVA rva = abs32_locations_[i]; diff --git a/courgette/disassembler_win32_x64_unittest.cc b/courgette/disassembler_win32_x64_unittest.cc index 345d416..f67e800 100644 --- a/courgette/disassembler_win32_x64_unittest.cc +++ b/courgette/disassembler_win32_x64_unittest.cc @@ -5,6 +5,7 @@ #include "courgette/disassembler_win32_x64.h" #include "base/memory/scoped_ptr.h" +#include "base/stl_util.h" #include "courgette/base_test_unittest.h" class DisassemblerWin32X64Test : public BaseTest { @@ -41,6 +42,7 @@ void DisassemblerWin32X64Test::TestExe() const { std::vector<courgette::RVA> relocs; bool can_parse_relocs = disassembler->ParseRelocs(&relocs); EXPECT_TRUE(can_parse_relocs); + EXPECT_TRUE(base::STLIsSorted(relocs)); const uint8* offset_p = disassembler->OffsetToPointer(0); EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()), diff --git a/courgette/disassembler_win32_x86.cc b/courgette/disassembler_win32_x86.cc index 8490fcb..dd3dd5e 100644 --- a/courgette/disassembler_win32_x86.cc +++ b/courgette/disassembler_win32_x86.cc @@ -377,8 +377,6 @@ bool DisassemblerWin32X86::ParseAbs32Relocs() { if (!ParseRelocs(&abs32_locations_)) return false; - std::sort(abs32_locations_.begin(), abs32_locations_.end()); - #if COURGETTE_HISTOGRAM_TARGETS for (size_t i = 0; i < abs32_locations_.size(); ++i) { RVA rva = abs32_locations_[i]; diff --git a/courgette/disassembler_win32_x86_unittest.cc b/courgette/disassembler_win32_x86_unittest.cc index 1161327..40cc412 100644 --- a/courgette/disassembler_win32_x86_unittest.cc +++ b/courgette/disassembler_win32_x86_unittest.cc @@ -5,6 +5,7 @@ #include "courgette/disassembler_win32_x86.h" #include "base/memory/scoped_ptr.h" +#include "base/stl_util.h" #include "courgette/base_test_unittest.h" class DisassemblerWin32X86Test : public BaseTest { @@ -41,6 +42,7 @@ void DisassemblerWin32X86Test::TestExe() const { std::vector<courgette::RVA> relocs; bool can_parse_relocs = disassembler->ParseRelocs(&relocs); EXPECT_TRUE(can_parse_relocs); + EXPECT_TRUE(base::STLIsSorted(relocs)); const uint8* offset_p = disassembler->OffsetToPointer(0); EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()), |