[lld] r350520 - [CodeView] More appropriate name and type for a Microsoft precompiled headers parameter. NFC

[Alexandre Ganea via llvm-commits]

Author: aganea
Date: Mon Jan  7 05:53:16 2019
New Revision: 350520

URL: http://llvm.org/viewvc/llvm-project?rev=350520&view=rev
Log:
[CodeView] More appropriate name and type for a Microsoft precompiled headers parameter. NFC

Modified:
    lld/trunk/COFF/InputFiles.h
    lld/trunk/COFF/PDB.cpp

Modified: lld/trunk/COFF/InputFiles.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/InputFiles.h?rev=350520&r1=350519&r2=350520&view=diff
==============================================================================
--- lld/trunk/COFF/InputFiles.h (original)
+++ lld/trunk/COFF/InputFiles.h Mon Jan  7 05:53:16 2019
@@ -154,7 +154,7 @@ public:
   // When using Microsoft precompiled headers, this is the PCH's key.
   // The same key is used by both the precompiled object, and objects using the
   // precompiled object. Any difference indicates out-of-date objects.
-  llvm::Optional<llvm::codeview::EndPrecompRecord> EndPrecomp;
+  llvm::Optional<uint32_t> PCHSignature;
 
 private:
   void initializeChunks();

Modified: lld/trunk/COFF/PDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/PDB.cpp?rev=350520&r1=350519&r2=350520&view=diff
==============================================================================
--- lld/trunk/COFF/PDB.cpp (original)
+++ lld/trunk/COFF/PDB.cpp Mon Jan  7 05:53:16 2019
@@ -494,13 +494,13 @@ PDBLinker::mergeDebugT(ObjFile *File, CV
 
     if (auto Err = mergeTypeAndIdRecords(GlobalIDTable, GlobalTypeTable,
                                          ObjectIndexMap->TPIMap, Types, Hashes,
-                                         File->EndPrecomp))
+                                         File->PCHSignature))
       fatal("codeview::mergeTypeAndIdRecords failed: " +
             toString(std::move(Err)));
   } else {
     if (auto Err =
             mergeTypeAndIdRecords(IDTable, TypeTable, ObjectIndexMap->TPIMap,
-                                  Types, File->EndPrecomp))
+                                  Types, File->PCHSignature))
       fatal("codeview::mergeTypeAndIdRecords failed: " +
             toString(std::move(Err)));
   }
@@ -632,7 +632,7 @@ PDBLinker::maybeMergeTypeServerPDB(ObjFi
     auto IpiHashes =
         GloballyHashedType::hashIds(ExpectedIpi->typeArray(), TpiHashes);
 
-    Optional<EndPrecompRecord> EndPrecomp;
+    Optional<uint32_t> EndPrecomp;
     // Merge TPI first, because the IPI stream will reference type indices.
     if (auto Err = mergeTypeRecords(GlobalTypeTable, IndexMap.TPIMap,
                                     ExpectedTpi->typeArray(), TpiHashes, EndPrecomp))
@@ -744,10 +744,10 @@ PDBLinker::aquirePrecompObj(ObjFile *Fil
 
   addObjFile(PrecompFile, &IndexMap);
 
-  if (!PrecompFile->EndPrecomp)
+  if (!PrecompFile->PCHSignature)
     fatal(PrecompFile->getName() + " is not a precompiled headers object");
 
-  if (Precomp.getSignature() != PrecompFile->EndPrecomp->getSignature())
+  if (Precomp.getSignature() != PrecompFile->PCHSignature.getValueOr(0))
     return createFileError(
         Precomp.getPrecompFilePath().str(),
         make_error<pdb::PDBError>(pdb::pdb_error_code::signature_out_of_date));