Unified usage of vector<unique_ptr<T>>

courgette/disassembler_elf_32.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COURGETTE_DISASSEMBLER_ELF_32_H_
 #define COURGETTE_DISASSEMBLER_ELF_32_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "courgette/disassembler.h"
 #include "courgette/image_utils.h"
 #include "courgette/memory_allocator.h"
 #include "courgette/types_elf.h"
 
 namespace courgette {
 
 class AssemblyProgram;
 
 // A Courgette disassembler for 32-bit ELF files. This is only a partial
@@ skipping 29 matching lines @@
     virtual CheckBool ComputeRelativeTarget(const uint8_t* op_pointer) = 0;
 
     // Emits the courgette instruction corresponding to the RVA type.
     virtual CheckBool EmitInstruction(AssemblyProgram* program,
                                       RVA target_rva) = 0;
 
     // Returns the size of the instruction containing the RVA.
     virtual uint16_t op_size() const = 0;
 
     // Comparator for sorting, which assumes uniqueness of RVAs.
-    static bool IsLessThanByRVA(TypedRVA* a, TypedRVA* b) {
+    static bool IsLessThanByRVA(const std::unique_ptr<TypedRVA>& a,
+      const std::unique_ptr<TypedRVA>& b) {

[huangs, 2016/05/11 04:49:23]

NIT: Align to "(" like
function_name(int param1,
              int param2) {

[etiennep, 2016/05/11 18:19:13]

Done.

       return a->rva() < b->rva();
     }
 
     // Comparator for sorting, which assumes uniqueness of file offsets.
-    static bool IsLessThanByFileOffset(TypedRVA* a, TypedRVA* b) {
+    static bool IsLessThanByFileOffset(const std::unique_ptr<TypedRVA>& a,
+      const std::unique_ptr<TypedRVA>& b) {

[huangs, 2016/05/11 04:49:23]

Same as above.

[etiennep, 2016/05/11 18:19:13]

Done.

       return a->file_offset() < b->file_offset();
     }
 
   private:
     const RVA rva_;
     RVA relative_target_ = kNoRVA;
     FileOffset file_offset_ = kNoFileOffset;
   };
 
  public:
   DisassemblerElf32(const void* start, size_t length);
 
   ~DisassemblerElf32() override { }
 
   // Disassembler interfaces.
   RVA FileOffsetToRVA(FileOffset file_offset) const override;
   FileOffset RVAToFileOffset(RVA rva) const override;
   RVA PointerToTargetRVA(const uint8_t* p) const override;
   virtual ExecutableType kind() const override = 0;
   bool ParseHeader() override;
   bool Disassemble(AssemblyProgram* target) override;
 
   virtual e_machine_values ElfEM() const = 0;
 
   // Public for unittests only
   std::vector<RVA> &Abs32Locations() { return abs32_locations_; }

[huangs, 2016/05/11 04:49:23]

Please group '&' with type (fixes earlier mistake), i.e., 

std::vector<RVA>& Abs32Locations()

same below.

[etiennep, 2016/05/11 18:19:12]

Done.

-  ScopedVector<TypedRVA> &Rel32Locations() { return rel32_locations_; }
+  std::vector<std::unique_ptr<TypedRVA>> &Rel32Locations() {
+    return rel32_locations_;
+  }
 
  protected:
   bool UpdateLength();
 
   // Misc Section Helpers
 
   Elf32_Half SectionHeaderCount() const {
     return section_header_table_size_;
   }
 
@@ skipping 25 matching lines @@
 
   CheckBool IsValidTargetRVA(RVA rva) const WARN_UNUSED_RESULT;
 
   // Converts an ELF relocation instruction into an RVA.
   virtual CheckBool RelToRVA(Elf32_Rel rel, RVA* result)
     const WARN_UNUSED_RESULT = 0;
 
   CheckBool RVAsToFileOffsets(const std::vector<RVA>& rvas,
                               std::vector<FileOffset>* file_offsets);
 
-  CheckBool RVAsToFileOffsets(ScopedVector<TypedRVA>* typed_rvas);
+  CheckBool RVAsToFileOffsets(
+    std::vector<std::unique_ptr<TypedRVA>>* typed_rvas);
 
   // Parsing code for Disassemble().
 
   virtual CheckBool ParseRelocationSection(const Elf32_Shdr* section_header,
                                            AssemblyProgram* program)
       WARN_UNUSED_RESULT = 0;
 
   virtual CheckBool ParseRel32RelocsFromSection(const Elf32_Shdr* section)
       WARN_UNUSED_RESULT = 0;
 
   CheckBool ParseFile(AssemblyProgram* target) WARN_UNUSED_RESULT;
 
   CheckBool ParseProgbitsSection(
       const Elf32_Shdr* section_header,
       std::vector<FileOffset>::iterator* current_abs_offset,
       std::vector<FileOffset>::iterator end_abs_offset,
-      ScopedVector<TypedRVA>::iterator* current_rel,
-      ScopedVector<TypedRVA>::iterator end_rel,
+      std::vector<std::unique_ptr<TypedRVA>>::iterator* current_rel,
+      std::vector<std::unique_ptr<TypedRVA>>::iterator end_rel,
       AssemblyProgram* program) WARN_UNUSED_RESULT;
 
   CheckBool ParseSimpleRegion(FileOffset start_file_offset,
                               FileOffset end_file_offset,
                               AssemblyProgram* program) WARN_UNUSED_RESULT;
 
   CheckBool ParseAbs32Relocs() WARN_UNUSED_RESULT;
 
   CheckBool CheckSection(RVA rva) WARN_UNUSED_RESULT;
 
@@ skipping 11 matching lines @@
   std::vector<Elf32_Half> section_header_file_offset_order_;
 
   const Elf32_Phdr* program_header_table_;
   Elf32_Half program_header_table_size_;
 
   // Pointer to string table containing section names.
   const char* default_string_section_;
   size_t default_string_section_size_;
 
   std::vector<RVA> abs32_locations_;
-  ScopedVector<TypedRVA> rel32_locations_;
+  std::vector<std::unique_ptr<TypedRVA>> rel32_locations_;
 
   DISALLOW_COPY_AND_ASSIGN(DisassemblerElf32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_ELF_32_H_