From: Reid Kleckner <rnk@google.com>
Date: Wed, 19 Dec 2018 20:54:06 +0000 (+0000)
Subject: [llvm-ar] Simplify string table get-or-insert pattern with .insert, NFC
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8099039d57d06bce4aa16881905b9ff5a371ab67;p=llvm

[llvm-ar] Simplify string table get-or-insert pattern with .insert, NFC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@349681 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Object/ArchiveWriter.cpp b/lib/Object/ArchiveWriter.cpp
index 4de5871c7ec..da93602cbb2 100644
--- a/lib/Object/ArchiveWriter.cpp
+++ b/lib/Object/ArchiveWriter.cpp
@@ -268,14 +268,12 @@ static void printMemberHeader(raw_ostream &Out, uint64_t Pos,
     NamePos = StringTable.tell();
     addToStringTable(StringTable, ArcName, M, Thin);
   } else {
-    StringMap<uint64_t>::const_iterator it = MemberNames.find(M.MemberName);
-    if (it == MemberNames.end()) {
-      NamePos = StringTable.tell();
+    auto Insertion = MemberNames.insert({M.MemberName, uint64_t(0)});
+    if (Insertion.second) {
+      Insertion.first->second = StringTable.tell();
       addToStringTable(StringTable, ArcName, M, Thin);
-      MemberNames[M.MemberName] = NamePos;
-    } else {
-      NamePos = it->second;
     }
+    NamePos = Insertion.first->second;
   }
   printWithSpacePadding(Out, NamePos, 15);
   printRestOfMemberHeader(Out, ModTime, M.UID, M.GID, M.Perms, Size);