Unified usage of vector<unique_ptr<T>>

courgette/disassembler_elf_32.cc

 // 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.
 
 #include "courgette/disassembler_elf_32.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "courgette/assembly_program.h"
@@ skipping 255 matching lines @@
   for (RVA rva : rvas) {
     FileOffset file_offset = RVAToFileOffset(rva);
     if (file_offset == kNoFileOffset)
       return false;
     file_offsets->push_back(file_offset);
   }
   return true;
 }
 
 CheckBool DisassemblerElf32::RVAsToFileOffsets(
-    ScopedVector<TypedRVA>* typed_rvas) {
-  for (TypedRVA* typed_rva : *typed_rvas) {
+    std::vector<std::unique_ptr<TypedRVA>>* typed_rvas) {
+  for (auto& typed_rva : *typed_rvas) {
     FileOffset file_offset = RVAToFileOffset(typed_rva->rva());
     if (file_offset == kNoFileOffset)
       return false;
     typed_rva->set_file_offset(file_offset);
   }
   return true;
 }
 
 CheckBool DisassemblerElf32::ParseFile(AssemblyProgram* program) {
   // Walk all the bytes in the file, whether or not in a section.
@@ skipping 10 matching lines @@
 
   if (!RVAsToFileOffsets(&rel32_locations_))
     return false;
   std::sort(rel32_locations_.begin(),
             rel32_locations_.end(),
             TypedRVA::IsLessThanByFileOffset);
 
   std::vector<FileOffset>::iterator current_abs_offset = abs_offsets.begin();
   std::vector<FileOffset>::iterator end_abs_offset = abs_offsets.end();
 
-  ScopedVector<TypedRVA>::iterator current_rel = rel32_locations_.begin();
-  ScopedVector<TypedRVA>::iterator end_rel = rel32_locations_.end();
+  auto current_rel = rel32_locations_.begin();

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

More consistent to keep at
std::vector<std::uniqe_ptr<TypedRVA>>::iterator
(even if it wraps to next line).

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

Done.

+  auto end_rel = rel32_locations_.end();
 
   // Visit section headers ordered by file offset.
   for (Elf32_Half section_id : section_header_file_offset_order_) {
     const Elf32_Shdr* section_header = SectionHeader(section_id);
 
     if (section_header->sh_type == SHT_NOBITS)
       continue;
 
     if (!ParseSimpleRegion(file_offset, section_header->sh_offset, program))
       return false;
@@ skipping 47 matching lines @@
     return false;
 
   // Make certain we consume all of the relocations as expected
   return (current_abs_offset == end_abs_offset);
 }
 
 CheckBool DisassemblerElf32::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) {
   // Walk all the bytes in the file, whether or not in a section.
   FileOffset file_offset = section_header->sh_offset;
   FileOffset section_end = section_header->sh_offset + section_header->sh_size;
 
   Elf32_Addr origin = section_header->sh_addr;
   FileOffset origin_offset = section_header->sh_offset;
   if (!program->EmitOriginInstruction(origin))
     return false;
 
@@ skipping 159 matching lines @@
     if (!ParseRel32RelocsFromSection(section_header))
       return false;
   }
   if (!found_rel32)
     VLOG(1) << "Warning: Found no rel32 addresses. Missing .text section?";
 
   return true;
 }
 
 }  // namespace courgette