commit 7b30f16c9ffa5e6a3731febd6009b2ee81ebf430
author Peter Collingbourne <peter@pcc.me.uk> Fri Mar 31 04:47:07 2017 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Fri Mar 31 04:47:07 2017 +0000
tree 74f911a85e64dee8419ab6bf19605ff48acae264
parent c66018e2477c06170a34ab497711b6d0a2be0c3f

Re-apply r299168 and r299169 now that the libdeps are fixed.

llvm-svn: 299184

lld/ELF/InputFiles.cpp

diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 5835caa..8a25d8e 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -818,7 +818,7 @@
   uint8_t Visibility = mapVisibility(ObjSym.getVisibility());
   bool CanOmitFromDynSym = ObjSym.canBeOmittedFromSymbolTable();
 
-  int C = check(ObjSym.getComdatIndex(), F->LogName);
+  int C = ObjSym.getComdatIndex();
   if (C != -1 && !KeptComdats[C])
     return Symtab<ELFT>::X->addUndefined(NameRef, /*IsLocal=*/false, Binding,
                                          Visibility, Type, CanOmitFromDynSym,
@@ -855,10 +855,8 @@
   Obj = check(lto::InputFile::create(MBRef), this->LogName);
 
   std::vector<bool> KeptComdats;
-  for (StringRef S : Obj->getComdatTable()) {
-    StringRef N = Saver.save(S);
-    KeptComdats.push_back(ComdatGroups.insert(CachedHashStringRef(N)).second);
-  }
+  for (StringRef S : Obj->getComdatTable())
+    KeptComdats.push_back(ComdatGroups.insert(CachedHashStringRef(S)).second);
 
   for (const lto::InputFile::Symbol &ObjSym : Obj->symbols())
     Symbols.push_back(createBitcodeSymbol<ELFT>(KeptComdats, ObjSym, this));