[llvm] r303711 - Fix broken build.

[Zachary Turner via llvm-commits]

Author: zturner
Date: Tue May 23 19:35:32 2017
New Revision: 303711

URL: http://llvm.org/viewvc/llvm-project?rev=303711&view=rev
Log:
Fix broken build.

Modified:
    llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp
    llvm/trunk/tools/llvm-readobj/COFFDumper.cpp

Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=303711&r1=303710&r2=303711&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp Tue May 23 19:35:32 2017
@@ -858,12 +858,12 @@ static void mergePdbs() {
     if (File.hasPDBTpiStream()) {
       auto &Tpi = ExitOnErr(File.getPDBTpiStream());
       ExitOnErr(codeview::mergeTypeRecords(MergedTpi, TypeMap, nullptr,
-                                           Tpi.typeCollection()));
+                                           Tpi.typeArray()));
     }
     if (File.hasPDBIpiStream()) {
       auto &Ipi = ExitOnErr(File.getPDBIpiStream());
       ExitOnErr(codeview::mergeIdRecords(MergedIpi, TypeMap, IdMap,
-                                         Ipi.typeCollection()));
+                                         Ipi.typeArray()));
     }
   }
 

Modified: llvm/trunk/tools/llvm-readobj/COFFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/COFFDumper.cpp?rev=303711&r1=303710&r2=303711&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/COFFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/COFFDumper.cpp Tue May 23 19:35:32 2017
@@ -1072,10 +1072,9 @@ void COFFDumper::mergeCodeViewTypes(Type
         W.flush();
         error(object_error::parse_failed);
       }
-      LazyRandomTypeCollection TypesAndIds(Types, 100);
       SmallVector<TypeIndex, 128> SourceToDest;
       if (auto EC = mergeTypeAndIdRecords(CVIDs, CVTypes, SourceToDest, nullptr,
-                                          TypesAndIds))
+                                          Types))
         return error(std::move(EC));
     }
   }