Fix Bug 30978 by emitting cv file checksums.

[ecbeckmann]

Summary

The checksums had already been placed in the IR, this patch allows
MCCodeView to actually write it out to an MCStreamer.

[ecbeckmann]

Rebase

[ecbeckmann]

tests

[ecbeckmann]

Some more testing changes.

[zturner]

Try to be more careful so as not to submit testing code / comments etc in uploaded patches. Reasons like this are why I prefer using a debugger instead of printf debugging :)

llvm/include/llvm/IR/DebugInfoMetadata.h

476–481

If you're going to make it an enum class, then it doesn't need the CSK prefix in the name, since you have to write ChecksumKind anyway. I wouldn't suggest churning the code to change the names everywhere it's used, so instead maybe just leave this as a regular enum. It's already scoped to DIFile anyway, so there's no risk of namespace pollution.

llvm/include/llvm/MC/MCCodeView.h

299–307

Any reason this isn't just:

struct FileInfo {
  StringRef Name;
  StringRef Checksum;
  ChecksumKind Kind;
};

SmallVector<FileInfo> Files;

having a StringMap seems unnecessary if we're already iterating a linear container anyway

llvm/lib/DebugInfo/CodeView/DebugChecksumsSubsection.cpp

53

Delete

llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp

32

Delete

38

Delete

44

Delete

llvm/lib/MC/MCCodeView.cpp

221–233

What is this? A bunch of code commented out, and then emitting a bunch of magic numbers?

llvm/tools/llvm-readobj/COFFDumper.cpp

936

Delete

938

Delete

1103

Delete

1105

Delete

[rnk]

llvm/lib/MC/MCCodeView.cpp

488–491

We shouldn't assume all DIFiles have MD5 checksums, we'll need some way to know the filechecksum table offset.

We should probably implement this FIXME:

// FIXME: We should store the string table offset of the filename, rather than
// the filename itself for efficiency.
Filename = addToStringTable(Filename);
Filenames[Idx] = Filename;

We should do that by making FIlenames a vector of two integers: the offset of the file in the file checksum table, and the offset of the filename in the string table.

All the places where we do 8 * (FileId - 1) we would rewrite to use Filenames[FileId - 1].ChecksumTableOffset.

[ecbeckmann]

Use MCFixup

[ecbeckmann]

Imprved?

[ecbeckmann]

Everything works finally.

[ecbeckmann]

llvm/include/llvm/MC/MCCodeView.h

284

remove

298

Just one comment says:

Array storing file information. Each tuple contains the string table offset, a symbol representing the file table offset, and a set flag.

303

remove

llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

701

remove this comment

703

remove junk here too

llvm/lib/DebugInfo/CodeView/DebugChecksumsSubsection.cpp

53

remove

llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp

32

remove

38

remove

44

remove

[ecbeckmann]

llvm/lib/MC/MCCodeView.cpp

49

remove

61

remove comment

134

combine this all into one line

135

Don't reassign to S and just directly use Ret.first

152

add a comment explaining this function

153

remove

159

remove spaces here

165

remove these

171

+=4 for the string table offset

174

+1 for size, +1 for kind, +2 to align (maybe just replace that with alignTo for clarity)

177

remove logging, more comments to explain offset

207

add comment explaining that, since the checksum section has been emitted, we can assume the offsets have been finalized so we can assign them.

218

update this comment

222

remove these

232

yes remove this

241

add comment to explain, how it needs to use a MCFixup provided by EmitValueImpl

253

remove

256

create a temporary symbol to hold the offset once it is calculated

291

remove

308

a

442

r

488

change this comment

llvm/lib/MC/MCObjectStreamer.cpp

144

r

llvm/lib/MC/MCParser/AsmParser.cpp

3455

should be lower case for consistency

llvm/lib/MC/WinCOFFObjectWriter.cpp

725

r

llvm/tools/llvm-readobj/COFFDumper.cpp

910

r these

1020

r

1105

not needed

[ecbeckmann]

Make this entire thing easier to follow and understand.

llvm/lib/MC/MCCodeView.cpp

58

This is confusing to read, make it more intuitive

[ecbeckmann]

Fortunately this seems to work whether generating assembly or object

[ecbeckmann]

Why do we have to add placeholders for the checksum offsets? Aren't they just added in order, one after another?

Actually, the implementation of addFile hasn't assumed it is done in order, and you can actually add random fileNo's whenever you want. Therefore, we shouldn't assume they are always done in order, and we should allow for the case where we don't yet know the checksum offset.

[ecbeckmann]

Add checksum offset directive.

[ecbeckmann]

Restructrue, create real symbol not temp.

[ecbeckmann]

Remove errant errors.

[ecbeckmann]

Format

[ecbeckmann]

llvm/include/llvm/IR/DebugInfoMetadata.h

476–481

Unfortunately I need the actual enum values to correspond exactly to the checksum types flag integer values actually present in the codeview section, hence the strongly typed enum class. This is important because I will now be emitting the ChecksumKind as assembly directives as well as directly into the binary.

llvm/include/llvm/MC/MCCodeView.h

299–307

Yes, combined all this info into one vector. It's still useful to have a StringMap because we want to check if a filename is already used before making a new entry.

[ecbeckmann]

Reformat

[ecbeckmann]

Reformat.

[ecbeckmann]

llvm/lib/MC/MCCodeView.cpp

221–233

It was all debugging code that was unintended for review. Please disregard. Sorry again for not making this patch private to begin with.

488–491

Filenames renamed to Files, which is now a vector of a massive structure containing all offset and checksum information.

[ecbeckmann]

llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

685

Update this FIXME to say that we do provide checksum file info, and what VS uses this for.

[rnk]

llvm/lib/MC/MCCodeView.cpp

167

I don't think you want to do this, this leaks the internal MCSymbol (file1, etc) to the assembler. Nothing in the assembly defines file1, so the assembly isn't very readable.

llvm/test/DebugInfo/COFF/inlining.ll

52 ↗

(On Diff #115274)

What I had in mind was that we'd add a directive like .cv_filechecksum_offset <fileid> and MCCodeView.cpp would internally implement it without leaking any labels to the caller. We could use a label difference of two symbols to implement the offset computation, but any symbols shouldn't leak out to the assembler.

[probinson]

llvm/include/llvm/IR/DebugInfoMetadata.h

476–481

If you need the enums to have specific values, e.g. because those values end up in the object file (hard to tell here but I think that's what you are saying), you should set the enum values explicitly. This documents the exact values you need (even if they happen to be sequential at the moment). Making it an enum class doesn't get you that.

llvm/lib/IR/DebugInfoMetadata.cpp

361

If you require exact correspondence between an enum and some array of strings, we usually do that with a .def file and macros. See for example Dwarf.def. As it is, the association between this array and the ChecksumKind values is implied rather than explicit. Safer to be explicit.

[rnk]

llvm/lib/MC/MCCodeView.cpp

68

Use MCContext::createTempSymbol to make sure these don't show up in the .obj symbol table.

[ecbeckmann]

Don't leak symbol into assembler, remove enum class, use createTempSymbol.

[ecbeckmann]

llvm/include/llvm/IR/DebugInfoMetadata.h

476–481

Remove enum class to explicitly define values.

llvm/lib/IR/DebugInfoMetadata.cpp

361

Okay this should probably be addressed in another patch as this patch did not introduce the array.

llvm/lib/MC/MCCodeView.cpp

167

Instead of emitting the symbol, we will emit the .cv_filechecksumoffset <fileno> directive.

[ecbeckmann]

Some formatting fixes.

[ecbeckmann]

Removed some last unnecessary changes.

[probinson]

A few minor commentary points; nothing huge. I've been looking at this mainly with the thought of having to do something similar for DWARF 5 eventually, but it seems likely there won't be a lot to leverage as CodeView and DWARF appear to associate the hashes with files pretty differently. Oh well.

llvm/include/llvm/IR/DebugInfoMetadata.h

476–481

And maybe a comment that these end up in the object file, so some well-meaning person doesn't come a long later and remove the "unnecessary" explicit values.

llvm/include/llvm/MC/MCStreamer.h

735

As long as you're changing the comment anyway, please remove the \brief.

777

Remove \brief.

[ecbeckmann]

llvm/test/DebugInfo/COFF/inlining.ll

52 ↗

(On Diff #115274)

implemented as such

[rnk]

Thanks, looks good!

llvm/include/llvm/MC/MCCodeView.h

301–302

Generally, if the comment describing the variable doesn't fit on one line, consider moving it before the variable. Then we won't end up with this awkard split after the *.

[ecbeckmann]

Changed some comments.

[ecbeckmann]

Updated comment formatting.

clang/lib/CodeGen/CGDebugInfo.cpp

StringRef CGDebugInfo::getClassName(const RecordDecl *RD) {
   return StringRef();
 }
 
 llvm::DIFile::ChecksumKind
 CGDebugInfo::computeChecksum(FileID FID, SmallString<32> &Checksum) const {
   Checksum.clear();
 
   if (!CGM.getCodeGenOpts().EmitCodeView)
-    return llvm::DIFile::CSK_None;
+    return llvm::DIFile::ChecksumKind::CSK_None;
 
   SourceManager &SM = CGM.getContext().getSourceManager();
   bool Invalid;
   llvm::MemoryBuffer *MemBuffer = SM.getBuffer(FID, &Invalid);
   if (Invalid)
-    return llvm::DIFile::CSK_None;
+    return llvm::DIFile::ChecksumKind::CSK_None;
 
   llvm::MD5 Hash;
   llvm::MD5::MD5Result Result;
 
   Hash.update(MemBuffer->getBuffer());
   Hash.final(Result);
 
   Hash.stringifyResult(Result, Checksum);
-  return llvm::DIFile::CSK_MD5;
+  return llvm::DIFile::ChecksumKind::CSK_MD5;
 }
 
 llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
   if (!Loc.isValid())
     // If Location is not valid then use main input file.
     return DBuilder.createFile(remapDIPath(TheCU->getFilename()),
                                remapDIPath(TheCU->getDirectory()),
                                TheCU->getFile()->getChecksumKind(),
if (!CWDName.empty())
     return CWDName;
   SmallString<256> CWD;
   llvm::sys::fs::current_path(CWD);
   return CWDName = internString(CWD);
 }
 
 void CGDebugInfo::CreateCompileUnit() {
   SmallString<32> Checksum;
-  llvm::DIFile::ChecksumKind CSKind = llvm::DIFile::CSK_None;
+  llvm::DIFile::ChecksumKind CSKind = llvm::DIFile::ChecksumKind::CSK_None;
 
   // Should we be asking the SourceManager for the main file name, instead of
   // accepting it as an argument? This just causes the main file name to
   // mismatch with source locations and create extra lexical scopes or
   // mismatched debug info (a CU with a DW_AT_file of "-", because that's what
   // the driver passed, but functions/other things have DW_AT_file of "<stdin>"
   // because that's what the SourceManager says)
 

llvm/include/llvm/IR/DIBuilder.h

createCompileUnit(unsigned Lang, DIFile *File, StringRef Producer,
                       bool DebugInfoForProfiling = false);
 
     /// Create a file descriptor to hold debugging information for a file.
     /// \param Filename  File name.
     /// \param Directory Directory.
     /// \param CSKind    Checksum kind (e.g. CSK_None, CSK_MD5, CSK_SHA1, etc.).
     /// \param Checksum  Checksum data.
     DIFile *createFile(StringRef Filename, StringRef Directory,
-                       DIFile::ChecksumKind CSKind = DIFile::CSK_None,
+                       DIFile::ChecksumKind CSKind = DIFile::ChecksumKind::CSK_None,
                        StringRef Checksum = StringRef());
 
     /// Create debugging information entry for a macro.
     /// \param Parent     Macro parent (could be nullptr).
     /// \param Line       Source line number where the macro is defined.
     /// \param MacroType  DW_MACINFO_define or DW_MACINFO_undef.
     /// \param Name       Macro name.
     /// \param Value      Macro value.

llvm/include/llvm/IR/DebugInfoMetadata.h

 ///
 /// TODO: Merge with directory/file node (including users).
 /// TODO: Canonicalize paths on creation.
 class DIFile : public DIScope {
   friend class LLVMContextImpl;
   friend class MDNode;
 
 public:
-  enum ChecksumKind {
+  enum class ChecksumKind : uint8_t {
     CSK_None,
     CSK_MD5,
     CSK_SHA1,
     CSK_Last = CSK_SHA1 // Should be last enumeration.
   };
 
 private:
   ChecksumKind CSKind;
 
   DIFile(LLVMContext &C, StorageType Storage, ChecksumKind CSK,
          ArrayRef<Metadata *> Ops)
       : DIScope(C, DIFileKind, Storage, dwarf::DW_TAG_file_type, Ops),
         CSKind(CSK) {}
private:
 
   TempDIFile cloneImpl() const {
     return getTemporary(getContext(), getFilename(), getDirectory(),
                         getChecksumKind(), getChecksum());
   }
 
 public:
   DEFINE_MDNODE_GET(DIFile, (StringRef Filename, StringRef Directory,
-                             ChecksumKind CSK = CSK_None,
+                             ChecksumKind CSK = ChecksumKind::CSK_None,
                              StringRef CS = StringRef()),
                     (Filename, Directory, CSK, CS))
   DEFINE_MDNODE_GET(DIFile, (MDString *Filename, MDString *Directory,
-                             ChecksumKind CSK = CSK_None,
+                             ChecksumKind CSK = ChecksumKind::CSK_None,
                              MDString *CS = nullptr),
                     (Filename, Directory, CSK, CS))
 
   TempDIFile clone() const { return cloneImpl(); }
 
   StringRef getFilename() const { return getStringOperand(0); }
   StringRef getDirectory() const { return getStringOperand(1); }
   StringRef getChecksum() const { return getStringOperand(2); }

llvm/include/llvm/MC/MCCodeView.h

 
 /// Holds state from .cv_file and .cv_loc directives for later emission.
 class CodeViewContext {
 public:
   CodeViewContext();
   ~CodeViewContext();
 
   bool isValidFileNumber(unsigned FileNumber) const;
-  bool addFile(unsigned FileNumber, StringRef Filename);
-  ArrayRef<StringRef> getFilenames() { return Filenames; }
+  bool addFile(unsigned FileNumber, StringRef Filename, StringRef Checksum, uint8_t ChecksumKind);
 
   /// Records the function id of a normal function. Returns false if the
   /// function id has already been used, and true otherwise.
   bool recordFunctionId(unsigned FuncId);
 
   /// Records the function id of an inlined call site. Records the "inlined at"
   /// location info of the call site, including what function or inlined call
   /// site it was inlined into. Returns false if the function id has already
public:
   void encodeDefRange(MCAsmLayout &Layout, MCCVDefRangeFragment &F);
 
   /// Emits the string table substream.
   void emitStringTable(MCObjectStreamer &OS);
 
   /// Emits the file checksum substream.
   void emitFileChecksums(MCObjectStreamer &OS);
 
+  void emitFileChecksumOffset(MCObjectStreamer &OS, unsigned FileNo);
+
 private:
   /// The current CodeView line information from the last .cv_loc directive.
   MCCVLoc CurrentCVLoc = MCCVLoc(0, 0, 0, 0, false, true);
   bool CVLocSeen = false;
 
   /// Map from string to string table offset.
   StringMap<unsigned> StringTable;
+  //std::map<unsigned, StringRef> StringTable;
 
   /// The fragment that ultimately holds our strings.
   MCDataFragment *StrTabFragment = nullptr;
   bool InsertedStrTabFragment = false;
 
   MCDataFragment *getStringTableFragment();
 
   /// Add something to the string table.
-  StringRef addToStringTable(StringRef S);
+  std::pair<StringRef, unsigned> addToStringTable(StringRef S);
 
   /// Get a string table offset.
   unsigned getStringTableOffset(StringRef S);
 
   /// An array of absolute paths. Eventually this may include the file checksum.
-  SmallVector<StringRef, 4> Filenames;
+  /// Array of string table offset, checksum table offset pairs.
+  SmallVector<std::tuple<unsigned, MCSymbol*, bool>, 4> Files;
+
+  // Map from filename to checksum.
+  // StringMap<std::pair<StringRef, uint8_t>> Checksums;
+  // Map from string table offset to checksum
+  std::map<unsigned, std::pair<StringRef, uint8_t>> Checksums;
 
   /// The offset of the first and last .cv_loc directive for a given function
   /// id.
   std::map<unsigned, std::pair<size_t, size_t>> MCCVLineStartStop;
 
   /// A collection of MCCVLineEntry for each section.
   std::vector<MCCVLineEntry> MCCVLines;
 
   /// All known functions and inlined call sites, indexed by function id.
   std::vector<MCCVFunctionInfo> Functions;
+
+  void assignChecksumOffsets(MCObjectStreamer &OS);
+
+  bool ChecksumOffsetsAssigned = false;
 };
 
 } // end namespace llvm
 #endif

llvm/include/llvm/MC/MCObjectStreamer.h

void EmitCVInlineLinetableDirective(unsigned PrimaryFunctionId,
                                       unsigned SourceLineNum,
                                       const MCSymbol *FnStartSym,
                                       const MCSymbol *FnEndSym) override;
   void EmitCVDefRangeDirective(
       ArrayRef<std::pair<const MCSymbol *, const MCSymbol *>> Ranges,
       StringRef FixedSizePortion) override;
   void EmitCVStringTableDirective() override;
   void EmitCVFileChecksumsDirective() override;
+  void EmitCVFileChecksumOffset(unsigned FileNo) override;
   void EmitDTPRel32Value(const MCExpr *Value) override;
   void EmitDTPRel64Value(const MCExpr *Value) override;
   void EmitTPRel32Value(const MCExpr *Value) override;
   void EmitTPRel64Value(const MCExpr *Value) override;
   void EmitGPRel32Value(const MCExpr *Value) override;
   void EmitGPRel64Value(const MCExpr *Value) override;
   bool EmitRelocDirective(const MCExpr &Offset, StringRef Name,
                           const MCExpr *Expr, SMLoc Loc) override;

llvm/include/llvm/MC/MCStreamer.h

public:
   virtual void EmitDwarfLocDirective(unsigned FileNo, unsigned Line,
                                      unsigned Column, unsigned Flags,
                                      unsigned Isa, unsigned Discriminator,
                                      StringRef FileName);
 
   /// \brief Associate a filename with a specified logical file number.  This
   /// implements the '.cv_file 4 "foo.c"' assembler directive. Returns true on
   /// success.
-  virtual bool EmitCVFileDirective(unsigned FileNo, StringRef Filename);
+  virtual bool EmitCVFileDirective(unsigned FileNo, StringRef Filename, StringRef Checksum, unsigned ChecksumKind);
 
   /// \brief Introduces a function id for use with .cv_loc.
   virtual bool EmitCVFuncIdDirective(unsigned FunctionId);
 
   /// \brief Introduces an inline call site id for use with .cv_loc. Includes
   /// extra information for inline line table generation.
   virtual bool EmitCVInlineSiteIdDirective(unsigned FunctionId, unsigned IAFunc,
                                            unsigned IAFile, unsigned IALine,
virtual void EmitCVDefRangeDirective(
       StringRef FixedSizePortion);
 
   /// \brief This implements the CodeView '.cv_stringtable' assembler directive.
   virtual void EmitCVStringTableDirective() {}
 
   /// \brief This implements the CodeView '.cv_filechecksums' assembler directive.
   virtual void EmitCVFileChecksumsDirective() {}
 
+  virtual void EmitCVFileChecksumOffset(unsigned FileNo) {}
+
   /// Emit the absolute difference between two symbols.
   ///
   /// \pre Offset of \c Hi is greater than the offset \c Lo.
   virtual void emitAbsoluteSymbolDiff(const MCSymbol *Hi, const MCSymbol *Lo,
                                       unsigned Size);
 
   virtual MCSymbol *getDwarfLineTableSymbol(unsigned CUID);
   virtual void EmitCFISections(bool EH, bool Debug);

llvm/lib/AsmParser/LLParser.cpp

MDStringField(bool AllowEmpty = true)
       : ImplTy(nullptr), AllowEmpty(AllowEmpty) {}
 };
 
 struct MDFieldList : public MDFieldImpl<SmallVector<Metadata *, 4>> {
   MDFieldList() : ImplTy(SmallVector<Metadata *, 4>()) {}
 };
 
 struct ChecksumKindField : public MDFieldImpl<DIFile::ChecksumKind> {
-  ChecksumKindField() : ImplTy(DIFile::CSK_None) {}
+  ChecksumKindField() : ImplTy(DIFile::ChecksumKind::CSK_None) {}
   ChecksumKindField(DIFile::ChecksumKind CSKind) : ImplTy(CSKind) {}
 };
 
 } // end anonymous namespace
 
 namespace llvm {
 
 template <>

llvm/lib/Bitcode/Reader/MetadataLoader.cpp

case bitc::METADATA_FILE: {
     if (Record.size() != 3 && Record.size() != 5)
       return error("Invalid record");
 
     IsDistinct = Record[0];
     MetadataList.assignValue(
         GET_OR_DISTINCT(
             DIFile,
             (Context, getMDString(Record[1]), getMDString(Record[2]),
-             Record.size() == 3 ? DIFile::CSK_None
+             Record.size() == 3 ? DIFile::ChecksumKind::CSK_None
                                 : static_cast<DIFile::ChecksumKind>(Record[3]),
              Record.size() == 3 ? nullptr : getMDString(Record[4]))),
         NextMetadataNo);
     NextMetadataNo++;
     break;
   }
   case bitc::METADATA_COMPILE_UNIT: {
     if (Record.size() < 14 || Record.size() > 18)

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

 }
 
 void ModuleBitcodeWriter::writeDIFile(const DIFile *N,
                                       SmallVectorImpl<uint64_t> &Record,
                                       unsigned Abbrev) {
   Record.push_back(N->isDistinct());
   Record.push_back(VE.getMetadataOrNullID(N->getRawFilename()));
   Record.push_back(VE.getMetadataOrNullID(N->getRawDirectory()));
-  Record.push_back(N->getChecksumKind());
+  Record.push_back(static_cast<uint8_t>(N->getChecksumKind()));
   Record.push_back(VE.getMetadataOrNullID(N->getRawChecksum()));
 
   Stream.EmitRecord(bitc::METADATA_FILE, Record, Abbrev);
   Record.clear();
 }
 
 void ModuleBitcodeWriter::writeDICompileUnit(const DICompileUnit *N,
                                              SmallVectorImpl<uint64_t> &Record,

llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

 }
 
 unsigned CodeViewDebug::maybeRecordFile(const DIFile *F) {
   unsigned NextId = FileIdMap.size() + 1;
   auto Insertion = FileIdMap.insert(std::make_pair(F, NextId));
   if (Insertion.second) {
     // We have to compute the full filepath and emit a .cv_file directive.
     StringRef FullPath = getFullFilepath(F);
-    bool Success = OS.EmitCVFileDirective(NextId, FullPath);
+    StringRef Checksum = F->getChecksum();
+    DIFile::ChecksumKind ChecksumKind = F->getChecksumKind();
+    bool Success = OS.EmitCVFileDirective(NextId, FullPath, Checksum, static_cast<unsigned>(ChecksumKind));
     (void)Success;
     assert(Success && ".cv_file directive failed");
   }
   return Insertion.first->second;
 }
 
 CodeViewDebug::InlineSite &
 CodeViewDebug::getInlineSite(const DILocation *InlinedAt,

 
 void CodeViewDebug::emitInlineeLinesSubsection() {
   if (InlinedSubprograms.empty())
     return;
 
   OS.AddComment("Inlinee lines subsection");
   MCSymbol *InlineEnd = beginCVSubsection(DebugSubsectionKind::InlineeLines);
 
   // We don't provide any extra file info.
   // FIXME: Find out if debuggers use this info.
   OS.AddComment("Inlinee lines signature");
   OS.EmitIntValue(unsigned(InlineeLinesSignature::Normal), 4);
 
   for (const DISubprogram *SP : InlinedSubprograms) {
     assert(TypeIndices.count({SP, nullptr}));
     TypeIndex InlineeIdx = TypeIndices[{SP, nullptr}];
 
     OS.AddBlankLine();
     unsigned FileId = maybeRecordFile(SP->getFile());
     OS.AddComment("Inlined function " + SP->getName() + " starts at " +
                   SP->getFilename() + Twine(':') + Twine(SP->getLine()));
     OS.AddBlankLine();
-    // The filechecksum table uses 8 byte entries for now, and file ids start at
+    // The filechecksum table uses 8 bytes entries for now, and file ids start at
     // 1.
-    unsigned FileOffset = (FileId - 1) * 8;
+    //unsigned FileOffset = (FileId - 1) * 12;
     OS.AddComment("Type index of inlined function");
     OS.EmitIntValue(InlineeIdx.getIndex(), 4);
     OS.AddComment("Offset into filechecksum table");
-    OS.EmitIntValue(FileOffset, 4);
+    //OS.EmitIntValue(FileOffset, 4);
+    OS.EmitCVFileChecksumOffset(FileId);
     OS.AddComment("Starting line number");
     OS.EmitIntValue(SP->getLine(), 4);
   }
 
   endCVSubsection(InlineEnd);
 }
 
 void CodeViewDebug::emitInlinedCallSite(const FunctionInfo &FI,

llvm/lib/DebugInfo/CodeView/DebugChecksumsSubsection.cpp

operator()(BinaryStreamRef Stream, uint32_t &Len, FileChecksumEntry &Item) {
   if (auto EC = Reader.readBytes(Item.Checksum, Header->ChecksumSize))
     return EC;
 
   Len = alignTo(Header->ChecksumSize + sizeof(FileChecksumEntryHeader), 4);
   return Error::success();
 }
 
 Error DebugChecksumsSubsectionRef::initialize(BinaryStreamReader Reader) {
+  //errs() << "checksum bytes remaining " << Reader.bytesRemaining() << "\n";
   if (auto EC = Reader.readArray(Checksums, Reader.bytesRemaining()))
     return EC;
-
   return Error::success();
 }
 
 Error DebugChecksumsSubsectionRef::initialize(BinaryStreamRef Section) {
   BinaryStreamReader Reader(Section);
   return initialize(Reader);
 }
 

llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp

DebugStringTableSubsectionRef::DebugStringTableSubsectionRef()
     : DebugSubsectionRef(DebugSubsectionKind::StringTable) {}
 
 Error DebugStringTableSubsectionRef::initialize(BinaryStreamRef Contents) {
   Stream = Contents;
   return Error::success();
 }
 
 Error DebugStringTableSubsectionRef::initialize(BinaryStreamReader &Reader) {
+  //errs() << "String table bytes remaining " << Reader.bytesRemaining() << "\n";
   return Reader.readStreamRef(Stream);
 }
 
 Expected<StringRef>
 DebugStringTableSubsectionRef::getString(uint32_t Offset) const {
+  //errs() << "DebugStringTableSubsectionRef getString\n";
   BinaryStreamReader Reader(Stream);
   Reader.setOffset(Offset);
   StringRef Result;
   if (auto EC = Reader.readCString(Result))
     return std::move(EC);
+  //errs() << "leaving getString\n";
   return Result;
 }
 
 DebugStringTableSubsection::DebugStringTableSubsection()
     : DebugSubsection(DebugSubsectionKind::StringTable) {}
 
 uint32_t DebugStringTableSubsection::insert(StringRef S) {
   auto P = Strings.insert({S, StringSize});

llvm/lib/IR/AsmWriter.cpp

void MDFieldPrinter::printMacinfoType(const DIMacroNode *N) {
   auto Type = dwarf::MacinfoString(N->getMacinfoType());
   if (!Type.empty())
     Out << Type;
   else
     Out << N->getMacinfoType();
 }
 
 void MDFieldPrinter::printChecksumKind(const DIFile *N) {
-  if (N->getChecksumKind() == DIFile::CSK_None)
+  if (N->getChecksumKind() == DIFile::ChecksumKind::CSK_None)
     // Skip CSK_None checksum kind.
     return;
   Out << FS << "checksumkind: " << N->getChecksumKindAsString();
 }
 
 void MDFieldPrinter::printString(StringRef Name, StringRef Value,
                                  bool ShouldSkipEmpty) {
   if (ShouldSkipEmpty && Value.empty())

llvm/lib/IR/DebugInfoMetadata.cpp

DISubroutineType *DISubroutineType::getImpl(LLVMContext &Context, DIFlags Flags,
                                             uint8_t CC, Metadata *TypeArray,
                                             StorageType Storage,
                                             bool ShouldCreate) {
   DEFINE_GETIMPL_LOOKUP(DISubroutineType, (Flags, CC, TypeArray));
   Metadata *Ops[] = {nullptr, nullptr, nullptr, TypeArray};
   DEFINE_GETIMPL_STORE(DISubroutineType, (Flags, CC), Ops);
 }
 
-static const char *ChecksumKindName[DIFile::CSK_Last + 1] = {
+static const char *ChecksumKindName[static_cast<uint8_t>(DIFile::ChecksumKind::CSK_Last) + 1] = {
   "CSK_None",
   "CSK_MD5",
   "CSK_SHA1"
 };
 
 DIFile::ChecksumKind DIFile::getChecksumKind(StringRef CSKindStr) {
   return StringSwitch<DIFile::ChecksumKind>(CSKindStr)
-      .Case("CSK_MD5", DIFile::CSK_MD5)
-      .Case("CSK_SHA1", DIFile::CSK_SHA1)
-      .Default(DIFile::CSK_None);
+      .Case("CSK_MD5", DIFile::ChecksumKind::CSK_MD5)
+      .Case("CSK_SHA1", DIFile::ChecksumKind::CSK_SHA1)
+      .Default(DIFile::ChecksumKind::CSK_None);
 }
 
 StringRef DIFile::getChecksumKindAsString() const {
-  assert(CSKind <= DIFile::CSK_Last && "Invalid checksum kind");
-  return ChecksumKindName[CSKind];
+  assert(CSKind <= DIFile::ChecksumKind::CSK_Last && "Invalid checksum kind");
+  return ChecksumKindName[static_cast<uint8_t>(CSKind)];
 }
 
 DIFile *DIFile::getImpl(LLVMContext &Context, MDString *Filename,
                         MDString *Directory, DIFile::ChecksumKind CSKind,
                         MDString *Checksum, StorageType Storage,
                         bool ShouldCreate) {
   assert(isCanonical(Filename) && "Expected canonical MDString");
   assert(isCanonical(Directory) && "Expected canonical MDString");

llvm/lib/IR/Verifier.cpp

if (auto *Types = N.getRawTypeArray()) {
     }
   }
   AssertDI(!hasConflictingReferenceFlags(N.getFlags()),
            "invalid reference flags", &N);
 }
 
 void Verifier::visitDIFile(const DIFile &N) {
   AssertDI(N.getTag() == dwarf::DW_TAG_file_type, "invalid tag", &N);
-  AssertDI((N.getChecksumKind() != DIFile::CSK_None ||
+  AssertDI((N.getChecksumKind() != DIFile::ChecksumKind::CSK_None ||
             N.getChecksum().empty()), "invalid checksum kind", &N);
 }
 
 void Verifier::visitDICompileUnit(const DICompileUnit &N) {
   AssertDI(N.isDistinct(), "compile units must be distinct", &N);
   AssertDI(N.getTag() == dwarf::DW_TAG_compile_unit, "invalid tag", &N);
 
   // Don't bother verifying the compilation directory or producer string

llvm/lib/MC/MCAsmStreamer.cpp

unsigned EmitDwarfFileDirective(unsigned FileNo, StringRef Directory,
                                   StringRef Filename,
                                   unsigned CUID = 0) override;
   void EmitDwarfLocDirective(unsigned FileNo, unsigned Line,
                              unsigned Column, unsigned Flags,
                              unsigned Isa, unsigned Discriminator,
                              StringRef FileName) override;
   MCSymbol *getDwarfLineTableSymbol(unsigned CUID) override;
 
-  bool EmitCVFileDirective(unsigned FileNo, StringRef Filename) override;
+  bool EmitCVFileDirective(unsigned FileNo, StringRef Filename, StringRef Checksum, unsigned ChecksumKind) override;
   bool EmitCVFuncIdDirective(unsigned FuncId) override;
   bool EmitCVInlineSiteIdDirective(unsigned FunctionId, unsigned IAFunc,
                                    unsigned IAFile, unsigned IALine,
                                    unsigned IACol, SMLoc Loc) override;
   void EmitCVLocDirective(unsigned FunctionId, unsigned FileNo, unsigned Line,
                           unsigned Column, bool PrologueEnd, bool IsStmt,
                           StringRef FileName, SMLoc Loc) override;
   void EmitCVLinetableDirective(unsigned FunctionId, const MCSymbol *FnStart,

 }
 
 MCSymbol *MCAsmStreamer::getDwarfLineTableSymbol(unsigned CUID) {
   // Always use the zeroth line table, since asm syntax only supports one line
   // table for now.
   return MCStreamer::getDwarfLineTableSymbol(0);
 }
 
-bool MCAsmStreamer::EmitCVFileDirective(unsigned FileNo, StringRef Filename) {
-  if (!getContext().getCVContext().addFile(FileNo, Filename))
+bool MCAsmStreamer::EmitCVFileDirective(unsigned FileNo, StringRef Filename, StringRef Checksum, unsigned ChecksumKind) {
+  if (!getContext().getCVContext().addFile(FileNo, Filename, Checksum, ChecksumKind))
     return false;
 
   OS << "\t.cv_file\t" << FileNo << ' ';
-
   PrintQuotedString(Filename, OS);
+
+  if (!ChecksumKind) {
+    EmitEOL();
+    return true;
+  }
+
+  OS << ' ';
+  PrintQuotedString(Checksum, OS);
+  OS << ' ' << ChecksumKind;
+
   EmitEOL();
   return true;
 }
 
 bool MCAsmStreamer::EmitCVFuncIdDirective(unsigned FuncId) {
   OS << "\t.cv_func_id " << FuncId << '\n';
   return MCStreamer::EmitCVFuncIdDirective(FuncId);
 }

llvm/lib/MC/MCCodeView.cpp

CodeViewContext::~CodeViewContext() {
   if (!InsertedStrTabFragment)
     delete StrTabFragment;
 }
 
 /// This is a valid number for use with .cv_loc if we've already seen a .cv_file
 /// for it.
 bool CodeViewContext::isValidFileNumber(unsigned FileNumber) const {
   unsigned Idx = FileNumber - 1;
-  if (Idx < Filenames.size())
-    return !Filenames[Idx].empty();
+  if (Idx < Files.size())
+    return std::get<2>(Files[Idx]);
   return false;
 }
 
-bool CodeViewContext::addFile(unsigned FileNumber, StringRef Filename) {
+bool CodeViewContext::addFile(unsigned FileNumber, StringRef Filename, StringRef Checksum, uint8_t ChecksumKind) {
   assert(FileNumber > 0);
-  Filename = addToStringTable(Filename);
+  auto FilenameOffset = addToStringTable(Filename);
+  Filename = FilenameOffset.first;
   unsigned Idx = FileNumber - 1;
-  if (Idx >= Filenames.size())
-    Filenames.resize(Idx + 1);
+  if (Idx >= Files.size())
+    Files.resize(Idx + 1);
 
   if (Filename.empty())
     Filename = "<stdin>";
 
-  if (!Filenames[Idx].empty())
+  if (std::get<2>(Files[Idx]))
     return false;
 
   // FIXME: We should store the string table offset of the filename, rather than
   // the filename itself for efficiency.
-  Filename = addToStringTable(Filename);
+  FilenameOffset = addToStringTable(Filename);
+  Filename = FilenameOffset.first;
+  unsigned Offset = FilenameOffset.second;
+
+  Files[Idx] = std::make_tuple(Offset, nullptr, true);
+
+  Checksums.insert(std::make_pair(Offset, std::make_pair(Checksum,ChecksumKind)));
 
-  Filenames[Idx] = Filename;
   return true;
 }
 
 bool CodeViewContext::recordFunctionId(unsigned FuncId) {
   if (FuncId >= Functions.size())
     Functions.resize(FuncId + 1);
 
   // Return false if this function info was already allocated.
MCDataFragment *CodeViewContext::getStringTableFragment() {
   if (!StrTabFragment) {
     StrTabFragment = new MCDataFragment();
     // Start a new string table out with a null byte.
     StrTabFragment->getContents().push_back('\0');
   }
   return StrTabFragment;
 }
 
-StringRef CodeViewContext::addToStringTable(StringRef S) {
+std::pair<StringRef,unsigned> CodeViewContext::addToStringTable(StringRef S) {
   SmallVectorImpl<char> &Contents = getStringTableFragment()->getContents();
   auto Insertion =
       StringTable.insert(std::make_pair(S, unsigned(Contents.size())));
   // Return the string from the table, since it is stable.
-  S = Insertion.first->first();
+  StringRef SR = Insertion.first->first();
+  unsigned Offset = Insertion.first->second;
+  std::pair<StringRef,unsigned> Ret = std::make_pair(SR, Offset);
+  S = Ret.first;
   if (Insertion.second) {
     // The string map key is always null terminated.
     Contents.append(S.begin(), S.end() + 1);
   }
-  return S;
+  return Ret;
 }
 
 unsigned CodeViewContext::getStringTableOffset(StringRef S) {
   // A string table offset of zero is always the empty string.
   if (S.empty())
     return 0;
   auto I = StringTable.find(S);
   assert(I != StringTable.end());
   return I->second;
 }
 
+void CodeViewContext::assignChecksumOffsets(MCObjectStreamer &OS) {
+  errs() << "assigning checksum offsets\n";
+
+  if (ChecksumOffsetsAssigned)
+    return;
+
+  ChecksumOffsetsAssigned = true;
+
+  unsigned CurrentOffset = 0;
+
+  MCContext &Ctx = OS.getContext();
+
+  for (auto File : Files) {
+    //File.second = CurrentOffset;
+    errs() << "setting " << std::get<1>(File)->getName() << "\n";
+    // Ctx.setSymbolValue(OS, std::get<1>(File)->getName(), CurrentOffset);
+    OS.EmitAssignment(std::get<1>(File), MCConstantExpr::create(CurrentOffset, Ctx));
+    CurrentOffset += 2;
+    auto Checksum = Checksums[std::get<0>(File)];
+    if (!Checksum.second) {
+      CurrentOffset += 2;
+      continue;
+    }
+    CurrentOffset += Checksum.first.size();
+  }
+}
+
 void CodeViewContext::emitStringTable(MCObjectStreamer &OS) {
   MCContext &Ctx = OS.getContext();
   MCSymbol *StringBegin = Ctx.createTempSymbol("strtab_begin", false),
            *StringEnd = Ctx.createTempSymbol("strtab_end", false);
 
   OS.EmitIntValue(unsigned(DebugSubsectionKind::StringTable), 4);
   OS.emitAbsoluteSymbolDiff(StringEnd, StringBegin, 4);
   OS.EmitLabel(StringBegin);
void CodeViewContext::emitStringTable(MCObjectStreamer &OS) {
   OS.EmitValueToAlignment(4, 0);
 
   OS.EmitLabel(StringEnd);
 }
 
 void CodeViewContext::emitFileChecksums(MCObjectStreamer &OS) {
   // Do nothing if there are no file checksums. Microsoft's linker rejects empty
   // CodeView substreams.
-  if (Filenames.empty())
+  if (Files.empty())
     return;
 
+  assignChecksumOffsets(OS);
+
   MCContext &Ctx = OS.getContext();
   MCSymbol *FileBegin = Ctx.createTempSymbol("filechecksums_begin", false),
            *FileEnd = Ctx.createTempSymbol("filechecksums_end", false);
 
   OS.EmitIntValue(unsigned(DebugSubsectionKind::FileChecksums), 4);
   OS.emitAbsoluteSymbolDiff(FileEnd, FileBegin, 4);
   OS.EmitLabel(FileBegin);
 
   // Emit an array of FileChecksum entries. We index into this table using the
   // user-provided file number. Each entry is currently 8 bytes, as we don't
   // emit checksums.
-  for (StringRef Filename : Filenames) {
-    OS.EmitIntValue(getStringTableOffset(Filename), 4);
-    // Zero the next two fields and align back to 4 bytes. This indicates that
-    // no checksum is present.
+  for (auto File : Files) {
+    OS.EmitIntValue(std::get<0>(File), 4);
+
+    std::pair<StringRef, uint8_t> Checksum = Checksums[std::get<0>(File)];
+    if (!Checksum.second) {
+      // There is no checksum.
       OS.EmitIntValue(0, 4);
+      continue;
+    }
+    OS.EmitIntValue(static_cast<uint8_t>(Checksum.first.size()), 1); //checksum size
+    // OS.EmitIntValue(6, 1);
+    // OS.EmitIntValue(3, 1);
+    // OS.EmitIntValue(3147, 6);
+    OS.EmitIntValue(Checksum.second, 1); //checksum type
+    OS.EmitBytes(Checksum.first); //actual checksum
+    OS.EmitValueToAlignment(4); //align
   }
 
   OS.EmitLabel(FileEnd);
 }
 
+void CodeViewContext::emitFileChecksumOffset(MCObjectStreamer &OS, unsigned FileNo) {
+  unsigned Idx = FileNo - 1;
+
+  if (Idx >= Files.size())
+    Files.resize(Idx + 1);
+
+  if (ChecksumOffsetsAssigned) {
+    OS.EmitSymbolValue(std::get<1>(Files[Idx]), 1);
+    return;
+  }
+
+  errs() << "FileNo " << FileNo << "\n";
+  errs() << "size " << Files.size() << "\n";
+
+  if (std::get<1>(Files[Idx]))
+    return;
+
+  std::get<1>(Files[Idx]) = OS.getContext().createTempSymbol(false);
+  const MCSymbolRefExpr *SRE = MCSymbolRefExpr::create(std::get<1>(Files[Idx]), OS.getContext());
+
+  OS.EmitValueImpl(SRE, 1);
+
+  // MCDataFragment *DF = OS.getOrCreateDataFragment();
+  // flushPendingLabels(DF, DF->getContents().size());
+
+  // DF->getFixups().push_back(MCFixup::create(DF->getContents().size(), SRE, FK_SecRel_1));
+}
+
 void CodeViewContext::emitLineTableForFunction(MCObjectStreamer &OS,
                                                unsigned FuncId,
                                                const MCSymbol *FuncBegin,
                                                const MCSymbol *FuncEnd) {
   MCContext &Ctx = OS.getContext();
   MCSymbol *LineBegin = Ctx.createTempSymbol("linetable_begin", false),
            *LineEnd = Ctx.createTempSymbol("linetable_end", false);
 
   OS.EmitIntValue(unsigned(DebugSubsectionKind::Lines), 4);
   OS.emitAbsoluteSymbolDiff(LineEnd, LineBegin, 4);
   OS.EmitLabel(LineBegin);
   OS.EmitCOFFSecRel32(FuncBegin, /*Offset=*/0);
   OS.EmitCOFFSectionIndex(FuncBegin);
 
   // Actual line info.
   std::vector<MCCVLineEntry> Locs = getFunctionLineEntries(FuncId);
   bool HaveColumns = any_of(Locs, [](const MCCVLineEntry &LineEntry) {
     return LineEntry.getColumn() != 0;
   });
   OS.EmitIntValue(HaveColumns ? int(LF_HaveColumns) : 0, 2);
   OS.emitAbsoluteSymbolDiff(FuncEnd, FuncBegin, 4);
 
+  //assignChecksumOffsets();
+
   for (auto I = Locs.begin(), E = Locs.end(); I != E;) {
     // Emit a file segment for the run of locations that share a file id.
     unsigned CurFileNum = I->getFileNum();
     auto FileSegEnd =
         std::find_if(I, E, [CurFileNum](const MCCVLineEntry &Loc) {
           return Loc.getFileNum() != CurFileNum;
         });
     unsigned EntryCount = FileSegEnd - I;
-    OS.AddComment("Segment for file '" + Twine(Filenames[CurFileNum - 1]) +
+    OS.AddComment("Segment for file '" + Twine(getStringTableFragment()->getContents()[std::get<0>(Files[CurFileNum - 1])]) +
                   "' begins");
-    OS.EmitIntValue(8 * (CurFileNum - 1), 4);
+    //OS.EmitIntValue(Files[CurFileNum].second, 4);
+    OS.EmitCVFileChecksumOffset(CurFileNum);
+    //OS.EmitIntValue(12 * (CurFileNum - 1), 4); // assumes 8 bytes checksum
     OS.EmitIntValue(EntryCount, 4);
     uint32_t SegmentSize = 12;
     SegmentSize += 8 * EntryCount;
     if (HaveColumns)
       SegmentSize += 4 * EntryCount;
     OS.EmitIntValue(SegmentSize, 4);
 
     for (auto J = I; J != FileSegEnd; ++J) {
       OS.emitAbsoluteSymbolDiff(J->getLabel(), FuncBegin, 4);
       unsigned LineData = J->getLine();
       if (J->isStmt())
void CodeViewContext::encodeInlineLineTable(MCAsmLayout &Layout,
 
   const MCSymbol *LastLabel = Frag.getFnStartSym();
   MCCVFunctionInfo::LineInfo LastSourceLoc, CurSourceLoc;
   LastSourceLoc.File = Frag.StartFileId;
   LastSourceLoc.Line = Frag.StartLineNum;
 
   SmallVectorImpl<char> &Buffer = Frag.getContents();
   Buffer.clear(); // Clear old contents if we went through relaxation.
+
+  //assignChecksumOffsets();
+
   for (const MCCVLineEntry &Loc : Locs) {
     // Exit early if our line table would produce an oversized InlineSiteSym
     // record. Account for the ChangeCodeLength annotation emitted after the
     // loop ends.
     constexpr uint32_t InlineSiteSize = 12;
     constexpr uint32_t AnnotationSize = 8;
     size_t MaxBufferSize = MaxRecordLength - InlineSiteSize - AnnotationSize;
     if (Buffer.size() >= MaxBufferSize)
for (const MCCVLineEntry &Loc : Locs) {
     // info, so we can skip updates for those.
     if (HaveOpenRange && CurSourceLoc.File == LastSourceLoc.File &&
         CurSourceLoc.Line == LastSourceLoc.Line)
       continue;
 
     HaveOpenRange = true;
 
     if (CurSourceLoc.File != LastSourceLoc.File) {
       // File ids are 1 based, and each file checksum table entry is 8 bytes
       // long. See emitFileChecksums above.
-      unsigned FileOffset = 8 * (CurSourceLoc.File - 1);
+      //unsigned FileOffset = 12 * (CurSourceLoc.File - 1);
+      unsigned FileOffset = std::get<1>(Files[CurSourceLoc.File]) ? static_cast<const MCConstantExpr*>(std::get<1>(Files[CurSourceLoc.File])->getVariableValue())->getValue() : 8;
       compressAnnotation(BinaryAnnotationsOpCode::ChangeFile, Buffer);
       compressAnnotation(FileOffset, Buffer);
     }
 
     int LineDelta = CurSourceLoc.Line - LastSourceLoc.Line;
     unsigned EncodedLineDelta = encodeSignedNumber(LineDelta);
     unsigned CodeDelta = computeLabelDiff(Layout, LastLabel, Loc.getLabel());
     if (CodeDelta == 0 && LineDelta != 0) {

llvm/lib/MC/MCObjectStreamer.cpp

if (Value->evaluateAsAbsolute(AbsValue, getAssembler())) {
     if (!isUIntN(8 * Size, AbsValue) && !isIntN(8 * Size, AbsValue)) {
       getContext().reportError(
           Loc, "value evaluated as " + Twine(AbsValue) + " is out of range.");
       return;
     }
     EmitIntValue(AbsValue, Size);
     return;
   }
+  errs() << "make fixup\n";
   DF->getFixups().push_back(
       MCFixup::create(DF->getContents().size(), Value,
                       MCFixup::getKindForSize(Size, false), Loc));
   DF->getContents().resize(DF->getContents().size() + Size, 0);
 }
 
 void MCObjectStreamer::EmitCFIStartProcImpl(MCDwarfFrameInfo &Frame) {
   // We need to create a local symbol to avoid relocations.

 
 void MCObjectStreamer::EmitCVStringTableDirective() {
   getContext().getCVContext().emitStringTable(*this);
 }
 void MCObjectStreamer::EmitCVFileChecksumsDirective() {
   getContext().getCVContext().emitFileChecksums(*this);
 }
 
+void MCObjectStreamer::EmitCVFileChecksumOffset(unsigned FileNo) {
+  getContext().getCVContext().emitFileChecksumOffset(*this, FileNo);
+}
+
 
 void MCObjectStreamer::EmitBytes(StringRef Data) {
   MCCVLineEntry::Make(this);
   MCDwarfLineEntry::Make(this, getCurrentSectionOnly());
   MCDataFragment *DF = getOrCreateDataFragment();
   flushPendingLabels(DF, DF->getContents().size());
   DF->getContents().append(Data.begin(), Data.end());
 }

llvm/lib/MC/MCParser/AsmParser.cpp

 
 /// parseDirectiveStabs
 /// ::= .stabs string, number, number, number
 bool AsmParser::parseDirectiveStabs() {
   return TokError("unsupported directive '.stabs'");
 }
 
 /// parseDirectiveCVFile
-/// ::= .cv_file number filename
+/// ::= .cv_file number filename [Checksum] [ChecksumKind]
 bool AsmParser::parseDirectiveCVFile() {
   SMLoc FileNumberLoc = getTok().getLoc();
   int64_t FileNumber;
   std::string Filename;
+  std::string Checksum;
+  int64_t ChecksumKind = 0;
 
   if (parseIntToken(FileNumber,
                     "expected file number in '.cv_file' directive") ||
       check(FileNumber < 1, FileNumberLoc, "file number less than one") ||
       check(getTok().isNot(AsmToken::String),
-            "unexpected token in '.cv_file' directive") ||
-      // Usually directory and filename are together, otherwise just
-      // directory. Allow the strings to have escaped octal character sequence.
-      parseEscapedString(Filename) ||
+            "a") ||
+      parseEscapedString(Filename))
+    return true;
+  if (!parseOptionalToken(AsmToken::EndOfStatement)) {
+    if(check(getTok().isNot(AsmToken::String),
+            "b") ||
+       parseEscapedString(Checksum) ||
+       parseIntToken(ChecksumKind, "expected checksum kind in '.cv_file' directive") ||
        parseToken(AsmToken::EndOfStatement,
-                 "unexpected token in '.cv_file' directive"))
+               "c"))
       return true;
+  }
+
 
-  if (!getStreamer().EmitCVFileDirective(FileNumber, Filename))
+  if (!getStreamer().EmitCVFileDirective(FileNumber, Filename, Checksum, static_cast<uint8_t>(ChecksumKind)))
     return Error(FileNumberLoc, "file number already allocated");
 
   return false;
 }
 
 bool AsmParser::parseCVFunctionId(int64_t &FunctionId,
                                   StringRef DirectiveName) {
   SMLoc Loc;

llvm/lib/MC/MCStreamer.cpp

 }
 
 void MCStreamer::EnsureValidDwarfFrame() {
   MCDwarfFrameInfo *CurFrame = getCurrentDwarfFrameInfo();
   if (!CurFrame || CurFrame->End)
     report_fatal_error("No open frame");
 }
 
-bool MCStreamer::EmitCVFileDirective(unsigned FileNo, StringRef Filename) {
-  return getContext().getCVContext().addFile(FileNo, Filename);
+bool MCStreamer::EmitCVFileDirective(unsigned FileNo, StringRef Filename, StringRef Checksum, unsigned ChecksumKind) {
+  return getContext().getCVContext().addFile(FileNo, Filename, Checksum, ChecksumKind);
 }
 
 bool MCStreamer::EmitCVFuncIdDirective(unsigned FunctionId) {
   return getContext().getCVContext().recordFunctionId(FunctionId);
 }
 
 bool MCStreamer::EmitCVInlineSiteIdDirective(unsigned FunctionId,
                                              unsigned IAFunc, unsigned IAFile,

llvm/lib/MC/WinCOFFObjectWriter.cpp

void WinCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
   const MCSymbol &A = Target.getSymA()->getSymbol();
   if (!A.isRegistered()) {
     Asm.getContext().reportError(Fixup.getLoc(),
                                       Twine("symbol '") + A.getName() +
                                           "' can not be undefined");
     return;
   }
   if (A.isTemporary() && A.isUndefined()) {
+    errs() << "about to report error\n";
     Asm.getContext().reportError(Fixup.getLoc(),
                                       Twine("assembler label '") + A.getName() +
                                           "' can not be undefined");
     return;
   }
 
   MCSection *MCSec = Fragment->getParent();
 

llvm/test/DebugInfo/COFF/multifile.ll

 attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-realign-stack" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
 attributes #1 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-realign-stack" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
 
 !llvm.dbg.cu = !{!0}
 !llvm.module.flags = !{!9, !10}
 !llvm.ident = !{!11}
 
 !0 = distinct !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.5 ", isOptimized: false, emissionKind: FullDebug, file: !1, enums: !2, retainedTypes: !2, globals: !2, imports: !2)
-!1 = !DIFile(filename: "<unknown>", directory: "D:\5C")
+!1 = !DIFile(filename: "<unknown>", directory: "D:\5C", checksumkind: CSK_MD5, checksum:"70b51f534d80639d033ae92c6a856af6")
 !2 = !{}
 !4 = distinct !DISubprogram(name: "f", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 3, file: !5, scope: !6, type: !7, variables: !2)
-!5 = !DIFile(filename: "input.c", directory: "D:\5C")
-!6 = !DIFile(filename: "input.c", directory: "D:C")
+!5 = !DIFile(filename: "input.c", directory: "D:\5C", checksumkind: CSK_MD5, checksum:"70b51f534d80639d033ae92c6a856af6")
+!6 = !DIFile(filename: "input.c", directory: "D:C", checksumkind: CSK_MD5, checksum:"70b51f534d80639d033ae92c6a856af6")
 !7 = !DISubroutineType(types: !8)
 !8 = !{null}
 !9 = !{i32 2, !"CodeView", i32 1}
 !10 = !{i32 1, !"Debug Info Version", i32 3}
 !11 = !{!"clang version 3.5 "}
 !12 = !DILocation(line: 1, scope: !13)
 !13 = !DILexicalBlockFile(discriminator: 0, file: !14, scope: !4)
-!14 = !DIFile(filename: "one.c", directory: "D:\5C")
+!14 = !DIFile(filename: "oneblahblahblah.c", directory: "D:\5C", checksumkind: CSK_MD5, checksum:"70b51f534d80639d033ae92c6a856af6")
 !15 = !DILocation(line: 2, scope: !16)
 !16 = !DILexicalBlockFile(discriminator: 0, file: !17, scope: !4)
-!17 = !DIFile(filename: "two.c", directory: "D:\5C")
+!17 = !DIFile(filename: "twoblahblahblah.c", directory: "D:\5C", checksumkind: CSK_MD5, checksum:"70b51f534d80639d033ae92c6a856af6")
 !18 = !DILocation(line: 7, scope: !13)
 !19 = !DILocation(line: 8, scope: !13)

llvm/tools/llvm-readobj/COFFDumper.cpp

for (const SectionRef &S : Obj->sections()) {
     StringRef SectionName;
     error(S.getName(SectionName));
     if (SectionName == ".debug$S")
       printCodeViewSymbolSection(SectionName, S);
   }
 }
 
 void COFFDumper::initializeFileAndStringTables(BinaryStreamReader &Reader) {
+errs() << "entered initialize function\n";
   while (Reader.bytesRemaining() > 0 &&
          (!CVFileChecksumTable.valid() || !CVStringTable.valid())) {
     // The section consists of a number of subsection in the following format:
     // |SubSectionType|SubSectionSize|Contents...|
     uint32_t SubType, SubSectionSize;
+    errs() << "about to read subtype\n";
     error(Reader.readInteger(SubType));
+    errs() << "about to read subsection size\n";
     error(Reader.readInteger(SubSectionSize));
 
+
+    errs() << "sub section size " << SubSectionSize << "\n";
+    errs() << "sub section type " << SubType << "\n";
     StringRef Contents;
+    errs() << "about to read contents\n";
     error(Reader.readFixedString(Contents, SubSectionSize));
+    errs() << "finished reading contents\n";
 
     BinaryStreamRef ST(Contents, support::little);
     switch (DebugSubsectionKind(SubType)) {
     case DebugSubsectionKind::FileChecksums:
+      errs() << "about to initialize checksum table\n";
       error(CVFileChecksumTable.initialize(ST));
       break;
     case DebugSubsectionKind::StringTable:
+      errs() << "initializing string table\n";
       error(CVStringTable.initialize(ST));
+      errs() << "initialized string table\n";
       break;
     default:
+      errs() << "initializing nothing\n";
       break;
     }
 
+    errs() << "\n\n\n";
     uint32_t PaddedSize = alignTo(SubSectionSize, 4);
     error(Reader.skip(PaddedSize - SubSectionSize));
   }
 }
 
 void COFFDumper::printCodeViewSymbolSection(StringRef SectionName,
                                             const SectionRef &Section) {
   StringRef SectionContents;
   error(Section.getContents(SectionContents));
   StringRef Data = SectionContents;
 
   SmallVector<StringRef, 10> FunctionNames;
   StringMap<StringRef> FunctionLineTables;
 
   ListScope D(W, "CodeViewDebugInfo");
   // Print the section to allow correlation with printSections.
   W.printNumber("Section", SectionName, Obj->getSectionID(Section));
 
   uint32_t Magic;
   error(consume(Data, Magic));
   W.printHex("Magic", Magic);
   if (Magic != COFF::DEBUG_SECTION_MAGIC)
     return error(object_error::parse_failed);
 
+  errs() << "about to initialize tables\n";
+
   BinaryStreamReader FSReader(Data, support::little);
   initializeFileAndStringTables(FSReader);
 
+  errs() << "initialized\n";
+
   // TODO: Convert this over to using ModuleSubstreamVisitor.
   while (!Data.empty()) {
     // The section consists of a number of subsection in the following format:
     // |SubSectionType|SubSectionSize|Contents...|
     uint32_t SubType, SubSectionSize;
     error(consume(Data, SubType));
     error(consume(Data, SubSectionSize));
 
case DebugSubsectionKind::Symbols:
       break;
 
     case DebugSubsectionKind::InlineeLines:
       printCodeViewInlineeLines(Contents);
       break;
 
     case DebugSubsectionKind::FileChecksums:
       printCodeViewFileChecksums(Contents);
       break;
 
     case DebugSubsectionKind::Lines: {
       // Holds a PC to file:line table.  Some data to parse this subsection is
       // stored in the other subsections, so just check sanity and store the
       // pointers for deferred processing.
 
       if (SubSectionSize < 12) {
         // There should be at least three words to store two function
for (unsigned I = 0, E = FunctionNames.size(); I != E; ++I) {
     DebugLinesSubsectionRef LineInfo;
     error(LineInfo.initialize(Reader));
 
     W.printHex("Flags", LineInfo.header()->Flags);
     W.printHex("CodeSize", LineInfo.header()->CodeSize);
     for (const auto &Entry : LineInfo) {
 
       ListScope S(W, "FilenameSegment");
+      //errs() << "about to pring filename with offset " << Entry.NameIndex << "\n";
       printFileNameForOffset("Filename", Entry.NameIndex);
+      //errs() << "printed filename\n";
       uint32_t ColumnIndex = 0;
       for (const auto &Line : Entry.LineNumbers) {
         if (Line.Offset >= LineInfo.header()->CodeSize) {
           error(object_error::parse_failed);
           return;
         }
 
         std::string PC = formatv("+{0:X}", uint32_t(Line.Offset));
if (!CVFileChecksumTable.valid() || !CVStringTable.valid())
     error(object_error::parse_failed);
 
   auto Iter = CVFileChecksumTable.getArray().at(FileOffset);
 
   // Check if the file checksum table offset is valid.
   if (Iter == CVFileChecksumTable.end())
     error(object_error::parse_failed);
 
+  errs() << "File offset: " << FileOffset << "\n";
   return error(CVStringTable.getString(Iter->FileNameOffset));
 }
 
 void COFFDumper::printFileNameForOffset(StringRef Label, uint32_t FileOffset) {
   W.printHex(Label, getFileNameForFileOffset(FileOffset), FileOffset);
 }
 
 void COFFDumper::mergeCodeViewTypes(TypeTableBuilder &CVIDs,

llvm/unittests/IR/MetadataTest.cpp

TEST_F(DISubroutineTypeTest, get) {
   EXPECT_EQ("", N->getName());
 }
 
 typedef MetadataTest DIFileTest;
 
 TEST_F(DIFileTest, get) {
   StringRef Filename = "file";
   StringRef Directory = "dir";
-  DIFile::ChecksumKind CSKind = DIFile::CSK_MD5;
+  DIFile::ChecksumKind CSKind = DIFile::ChecksumKind::CSK_MD5;
   StringRef Checksum = "000102030405060708090a0b0c0d0e0f";
   auto *N = DIFile::get(Context, Filename, Directory, CSKind, Checksum);
 
   EXPECT_EQ(dwarf::DW_TAG_file_type, N->getTag());
   EXPECT_EQ(Filename, N->getFilename());
   EXPECT_EQ(Directory, N->getDirectory());
   EXPECT_EQ(CSKind, N->getChecksumKind());
   EXPECT_EQ(Checksum, N->getChecksum());
   EXPECT_EQ(N, DIFile::get(Context, Filename, Directory, CSKind, Checksum));
 
   EXPECT_NE(N, DIFile::get(Context, "other", Directory, CSKind, Checksum));
   EXPECT_NE(N, DIFile::get(Context, Filename, "other", CSKind, Checksum));
-  EXPECT_NE(N, DIFile::get(Context, Filename, Directory, DIFile::CSK_SHA1, Checksum));
+  EXPECT_NE(N, DIFile::get(Context, Filename, Directory, DIFile::ChecksumKind::CSK_SHA1, Checksum));
   EXPECT_NE(N, DIFile::get(Context, Filename, Directory));
 
   TempDIFile Temp = N->clone();
   EXPECT_EQ(N, MDNode::replaceWithUniqued(std::move(Temp)));
 }
 
 TEST_F(DIFileTest, ScopeGetFile) {
   // Ensure that DIScope::getFile() returns itself.