Improve map insertions

snapshot/mac/mach_o_image_segment_reader.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "snapshot/mac/mach_o_image_segment_reader.h"
 
 #include <mach-o/loader.h>
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "snapshot/mac/process_reader.h"
 #include "util/mac/checked_mach_address_range.h"
 #include "util/mac/mac_util.h"
 #include "util/stdlib/strnlen.h"
 
 namespace crashpad {
 
 namespace {
@@ skipping 149 matching lines @@
                           "section type 0x%x at 0x%llx has unexpected offset "
                           "0x%x in segment at 0x%llx with offset 0x%llx",
                           section_type,
                           section.addr,
                           section.offset,
                           segment_command_.vmaddr,
                           segment_command_.fileoff) << section_info;
       return false;
     }
 
-    const auto& iterator = section_map_.find(section_name);
-    if (iterator != section_map_.end()) {
+    const auto insert_result =
+        section_map_.insert(std::make_pair(section_name, section_index));
+    if (!insert_result.second) {
       LOG(WARNING) << base::StringPrintf("duplicate section name at %zu",
-                                         iterator->second) << section_info;
+                                         insert_result.first->second)
+                   << section_info;
       return false;
     }
-
-    section_map_[section_name] = section_index;
   }
 
   INITIALIZATION_STATE_SET_VALID(initialized_);
   return true;
 }
 
 std::string MachOImageSegmentReader::Name() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   return NameInternal();
 }
@@ skipping 84 matching lines @@
 }
 
 void MachOImageSegmentReader::SetSlide(mach_vm_size_t slide) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_slide_);
   slide_ = slide;
   INITIALIZATION_STATE_SET_VALID(initialized_slide_);
 }
 
 }  // namespace crashpad