Index: clang/lib/CodeGen/CGDebugInfo.cpp =================================================================== --- clang/lib/CodeGen/CGDebugInfo.cpp +++ clang/lib/CodeGen/CGDebugInfo.cpp @@ -367,13 +367,13 @@ 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; @@ -382,7 +382,7 @@ Hash.final(Result); Hash.stringifyResult(Result, Checksum); - return llvm::DIFile::CSK_MD5; + return llvm::DIFile::ChecksumKind::CSK_MD5; } llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) { @@ -473,7 +473,7 @@ 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 Index: llvm/include/llvm/IR/DIBuilder.h =================================================================== --- llvm/include/llvm/IR/DIBuilder.h +++ llvm/include/llvm/IR/DIBuilder.h @@ -130,7 +130,7 @@ /// \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::None, StringRef Checksum = StringRef()); /// Create debugging information entry for a macro. Index: llvm/include/llvm/IR/DebugInfoMetadata.h =================================================================== --- llvm/include/llvm/IR/DebugInfoMetadata.h +++ llvm/include/llvm/IR/DebugInfoMetadata.h @@ -473,11 +473,11 @@ friend class MDNode; public: - enum ChecksumKind { - CSK_None, - CSK_MD5, - CSK_SHA1, - CSK_Last = CSK_SHA1 // Should be last enumeration. + enum class ChecksumKind : uint8_t { + None, + MD5, + SHA1, + Last = SHA1 // Should be last enumeration. }; private: @@ -506,13 +506,15 @@ } public: - DEFINE_MDNODE_GET(DIFile, (StringRef Filename, StringRef Directory, - ChecksumKind CSK = CSK_None, - StringRef CS = StringRef()), + DEFINE_MDNODE_GET(DIFile, + (StringRef Filename, StringRef Directory, + ChecksumKind CSK = ChecksumKind::None, + StringRef CS = StringRef()), (Filename, Directory, CSK, CS)) - DEFINE_MDNODE_GET(DIFile, (MDString *Filename, MDString *Directory, - ChecksumKind CSK = CSK_None, - MDString *CS = nullptr), + DEFINE_MDNODE_GET(DIFile, + (MDString * Filename, MDString *Directory, + ChecksumKind CSK = ChecksumKind::None, + MDString *CS = nullptr), (Filename, Directory, CSK, CS)) TempDIFile clone() const { return cloneImpl(); } Index: llvm/include/llvm/MC/MCCodeView.h =================================================================== --- llvm/include/llvm/MC/MCCodeView.h +++ llvm/include/llvm/MC/MCCodeView.h @@ -161,8 +161,8 @@ ~CodeViewContext(); bool isValidFileNumber(unsigned FileNumber) const; - bool addFile(unsigned FileNumber, StringRef Filename); - ArrayRef getFilenames() { return Filenames; } + bool addFile(MCStreamer &OS, 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. @@ -273,6 +273,17 @@ /// Emits the file checksum substream. void emitFileChecksums(MCObjectStreamer &OS); + /// Emits the offset into the checksum table of the given file number. + void emitFileChecksumOffset(MCStreamer &OS, unsigned FileNo); + + /// Assign the given file to have this offset in the checksum table. + void emitFileChecksumOffsetAssignment(MCStreamer &OS, MCSymbol *File, + unsigned Offset); + + /// Assign all of the currently registered files their offsets in the checksum + /// table. + void emitFileChecksumOffsetAssignments(MCStreamer &OS); + private: /// The current CodeView line information from the last .cv_loc directive. MCCVLoc CurrentCVLoc = MCCVLoc(0, 0, 0, 0, false, true); @@ -287,14 +298,27 @@ MCDataFragment *getStringTableFragment(); - /// Add something to the string table. - StringRef addToStringTable(StringRef S); + /// Add something to the string table. Returns the final string as well as + /// offset into the string table. + std::pair 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 Filenames; + struct FileInfo { + unsigned StringTableOffset; + MCSymbol *ChecksumTableOffset; // Is a symbol because it might be requested + // before it has been calculated, so a fixup + // may be needed. + bool Assigned = false; // Indicates if this FileInfo corresponds to an + // actual file, or hasn't been set yet. + std::string Checksum; + uint8_t ChecksumKind; + }; + + /// Array storing added file information. Each entry contains string table + /// offset and checksum table offset. + SmallVector Files; /// The offset of the first and last .cv_loc directive for a given function /// id. @@ -305,6 +329,10 @@ /// All known functions and inlined call sites, indexed by function id. std::vector Functions; + + /// Indicate whether we have already laid out the checksum table addresses or + /// not. + bool ChecksumOffsetsAssigned = false; }; } // end namespace llvm Index: llvm/include/llvm/MC/MCObjectStreamer.h =================================================================== --- llvm/include/llvm/MC/MCObjectStreamer.h +++ llvm/include/llvm/MC/MCObjectStreamer.h @@ -140,6 +140,8 @@ StringRef FixedSizePortion) override; void EmitCVStringTableDirective() override; void EmitCVFileChecksumsDirective() override; + void EmitCVFileChecksumOffsetDirective(MCSymbol *File, + unsigned Offset) override; void EmitDTPRel32Value(const MCExpr *Value) override; void EmitDTPRel64Value(const MCExpr *Value) override; void EmitTPRel32Value(const MCExpr *Value) override; Index: llvm/include/llvm/MC/MCStreamer.h =================================================================== --- llvm/include/llvm/MC/MCStreamer.h +++ llvm/include/llvm/MC/MCStreamer.h @@ -729,10 +729,11 @@ 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); + /// \brief Associate a filename with a specified logical file number, and also + /// specify that file's checksum information. This implements the '.cv_file 4 + /// "foo.c"' assembler directive. Returns true on success. + 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); @@ -774,6 +775,17 @@ /// \brief This implements the CodeView '.cv_filechecksums' assembler directive. virtual void EmitCVFileChecksumsDirective() {} + virtual void EmitCVFileChecksumOffset(unsigned FileNo); + + /// \brief This implements the CodeView '.cv_filechecksumoffset' assembler + /// directive. + virtual void EmitCVFileChecksumOffsetDirective(MCSymbol *File, + unsigned Offset) {} + + /// This outputs all of the checksum offset directives of added files, in + /// order of file number. + virtual void EmitCVFileChecksumOffsetDirectives(); + /// Emit the absolute difference between two symbols. /// /// \pre Offset of \c Hi is greater than the offset \c Lo. Index: llvm/lib/AsmParser/LLParser.cpp =================================================================== --- llvm/lib/AsmParser/LLParser.cpp +++ llvm/lib/AsmParser/LLParser.cpp @@ -3525,7 +3525,7 @@ }; struct ChecksumKindField : public MDFieldImpl { - ChecksumKindField() : ImplTy(DIFile::CSK_None) {} + ChecksumKindField() : ImplTy(DIFile::ChecksumKind::None) {} ChecksumKindField(DIFile::ChecksumKind CSKind) : ImplTy(CSKind) {} }; Index: llvm/lib/Bitcode/Reader/MetadataLoader.cpp =================================================================== --- llvm/lib/Bitcode/Reader/MetadataLoader.cpp +++ llvm/lib/Bitcode/Reader/MetadataLoader.cpp @@ -1347,7 +1347,7 @@ GET_OR_DISTINCT( DIFile, (Context, getMDString(Record[1]), getMDString(Record[2]), - Record.size() == 3 ? DIFile::CSK_None + Record.size() == 3 ? DIFile::ChecksumKind::None : static_cast(Record[3]), Record.size() == 3 ? nullptr : getMDString(Record[4]))), NextMetadataNo); Index: llvm/lib/Bitcode/Writer/BitcodeWriter.cpp =================================================================== --- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -1526,7 +1526,7 @@ 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(N->getChecksumKind())); Record.push_back(VE.getMetadataOrNullID(N->getRawChecksum())); Stream.EmitRecord(bitc::METADATA_FILE, Record, Abbrev); Index: llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp =================================================================== --- llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp +++ llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp @@ -159,7 +159,10 @@ 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(ChecksumKind)); (void)Success; assert(Success && ".cv_file directive failed"); } @@ -473,6 +476,7 @@ // This subsection holds a file index to offset in string table table. OS.AddComment("File index to string table offset subsection"); OS.EmitCVFileChecksumsDirective(); + OS.EmitCVFileChecksumOffsetDirectives(); // This subsection holds the string table. OS.AddComment("String table"); @@ -695,13 +699,10 @@ 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 - // 1. - unsigned FileOffset = (FileId - 1) * 8; OS.AddComment("Type index of inlined function"); OS.EmitIntValue(InlineeIdx.getIndex(), 4); OS.AddComment("Offset into filechecksum table"); - OS.EmitIntValue(FileOffset, 4); + OS.EmitCVFileChecksumOffset(FileId); OS.AddComment("Starting line number"); OS.EmitIntValue(SP->getLine(), 4); } Index: llvm/lib/DebugInfo/CodeView/DebugChecksumsSubsection.cpp =================================================================== --- llvm/lib/DebugInfo/CodeView/DebugChecksumsSubsection.cpp +++ llvm/lib/DebugInfo/CodeView/DebugChecksumsSubsection.cpp @@ -52,7 +52,6 @@ Error DebugChecksumsSubsectionRef::initialize(BinaryStreamReader Reader) { if (auto EC = Reader.readArray(Checksums, Reader.bytesRemaining())) return EC; - return Error::success(); } Index: llvm/lib/IR/AsmWriter.cpp =================================================================== --- llvm/lib/IR/AsmWriter.cpp +++ llvm/lib/IR/AsmWriter.cpp @@ -1493,7 +1493,7 @@ } void MDFieldPrinter::printChecksumKind(const DIFile *N) { - if (N->getChecksumKind() == DIFile::CSK_None) + if (N->getChecksumKind() == DIFile::ChecksumKind::None) // Skip CSK_None checksum kind. return; Out << FS << "checksumkind: " << N->getChecksumKindAsString(); Index: llvm/lib/IR/DebugInfoMetadata.cpp =================================================================== --- llvm/lib/IR/DebugInfoMetadata.cpp +++ llvm/lib/IR/DebugInfoMetadata.cpp @@ -354,22 +354,20 @@ DEFINE_GETIMPL_STORE(DISubroutineType, (Flags, CC), Ops); } -static const char *ChecksumKindName[DIFile::CSK_Last + 1] = { - "CSK_None", - "CSK_MD5", - "CSK_SHA1" -}; +static const char + *ChecksumKindName[static_cast(DIFile::ChecksumKind::Last) + 1] = { + "CSK_None", "CSK_MD5", "CSK_SHA1"}; DIFile::ChecksumKind DIFile::getChecksumKind(StringRef CSKindStr) { return StringSwitch(CSKindStr) - .Case("CSK_MD5", DIFile::CSK_MD5) - .Case("CSK_SHA1", DIFile::CSK_SHA1) - .Default(DIFile::CSK_None); + .Case("CSK_MD5", DIFile::ChecksumKind::MD5) + .Case("CSK_SHA1", DIFile::ChecksumKind::SHA1) + .Default(DIFile::ChecksumKind::None); } StringRef DIFile::getChecksumKindAsString() const { - assert(CSKind <= DIFile::CSK_Last && "Invalid checksum kind"); - return ChecksumKindName[CSKind]; + assert(CSKind <= DIFile::ChecksumKind::Last && "Invalid checksum kind"); + return ChecksumKindName[static_cast(CSKind)]; } DIFile *DIFile::getImpl(LLVMContext &Context, MDString *Filename, Index: llvm/lib/IR/Verifier.cpp =================================================================== --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -963,8 +963,9 @@ void Verifier::visitDIFile(const DIFile &N) { AssertDI(N.getTag() == dwarf::DW_TAG_file_type, "invalid tag", &N); - AssertDI((N.getChecksumKind() != DIFile::CSK_None || - N.getChecksum().empty()), "invalid checksum kind", &N); + AssertDI((N.getChecksumKind() != DIFile::ChecksumKind::None || + N.getChecksum().empty()), + "invalid checksum kind", &N); } void Verifier::visitDICompileUnit(const DICompileUnit &N) { Index: llvm/lib/MC/MCAsmStreamer.cpp =================================================================== --- llvm/lib/MC/MCAsmStreamer.cpp +++ llvm/lib/MC/MCAsmStreamer.cpp @@ -225,7 +225,8 @@ 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, @@ -245,6 +246,8 @@ StringRef FixedSizePortion) override; void EmitCVStringTableDirective() override; void EmitCVFileChecksumsDirective() override; + void EmitCVFileChecksumOffsetDirective(MCSymbol *File, + unsigned Offset) override; void EmitIdent(StringRef IdentString) override; void EmitCFISections(bool EH, bool Debug) override; @@ -1120,13 +1123,25 @@ 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(*this, 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; } @@ -1228,6 +1243,14 @@ EmitEOL(); } +void MCAsmStreamer::EmitCVFileChecksumOffsetDirective(MCSymbol *File, + unsigned Offset) { + OS << "\t.cv_filechecksumoffset\t"; + File->print(OS, MAI); + OS << " " << Offset; + EmitEOL(); +} + void MCAsmStreamer::EmitIdent(StringRef IdentString) { assert(MAI->hasIdentDirective() && ".ident directive not supported"); OS << "\t.ident\t"; Index: llvm/lib/MC/MCCodeView.cpp =================================================================== --- llvm/lib/MC/MCCodeView.cpp +++ llvm/lib/MC/MCCodeView.cpp @@ -39,29 +39,39 @@ /// 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 Files[Idx].Assigned; return false; } -bool CodeViewContext::addFile(unsigned FileNumber, StringRef Filename) { +bool CodeViewContext::addFile(MCStreamer &OS, 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 = ""; - if (!Filenames[Idx].empty()) + if (Files[Idx].Assigned) 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; + + auto ChecksumOffsetSymbol = + OS.getContext().getOrCreateSymbol("file" + std::to_string(FileNumber)); + Files[Idx].StringTableOffset = Offset; + Files[Idx].ChecksumTableOffset = ChecksumOffsetSymbol; + Files[Idx].Assigned = true; + Files[Idx].Checksum = Checksum.str(); + Files[Idx].ChecksumKind = ChecksumKind; - Filenames[Idx] = Filename; return true; } @@ -118,17 +128,18 @@ return StrTabFragment; } -StringRef CodeViewContext::addToStringTable(StringRef S) { +std::pair CodeViewContext::addToStringTable(StringRef S) { SmallVectorImpl &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(); + std::pair Ret = + std::make_pair(Insertion.first->first(), Insertion.first->second); if (Insertion.second) { // The string map key is always null terminated. - Contents.append(S.begin(), S.end() + 1); + Contents.append(Ret.first.begin(), Ret.first.end() + 1); } - return S; + return Ret; } unsigned CodeViewContext::getStringTableOffset(StringRef S) { @@ -140,6 +151,34 @@ return I->second; } +// Induce fixups for all the placeholder symbols used to store file checksum +// offsets. +void CodeViewContext::emitFileChecksumOffsetAssignment(MCStreamer &OS, + MCSymbol *File, + unsigned Offset) { + MCContext &Ctx = OS.getContext(); + OS.EmitAssignment(File, MCConstantExpr::create(Offset, Ctx)); +} + +void CodeViewContext::emitFileChecksumOffsetAssignments(MCStreamer &OS) { + if (ChecksumOffsetsAssigned) + return; + ChecksumOffsetsAssigned = true; + unsigned CurrentOffset = 0; + for (auto File : Files) { + OS.EmitCVFileChecksumOffsetDirective(File.ChecksumTableOffset, + CurrentOffset); + CurrentOffset += 4; + if (!File.ChecksumKind) { + CurrentOffset += 4; + continue; + } + CurrentOffset += 2; + CurrentOffset += File.Checksum.size(); + CurrentOffset = alignTo(CurrentOffset, 4); + } +} + void CodeViewContext::emitStringTable(MCObjectStreamer &OS) { MCContext &Ctx = OS.getContext(); MCSymbol *StringBegin = Ctx.createTempSymbol("strtab_begin", false), @@ -165,7 +204,7 @@ 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; MCContext &Ctx = OS.getContext(); @@ -177,18 +216,46 @@ 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. - OS.EmitIntValue(0, 4); + // user-provided file number. Each entry may be a variable number of bytes + // determined by the checksum kind and size. + for (auto File : Files) { + OS.EmitIntValue(File.StringTableOffset, 4); + + if (!File.ChecksumKind) { + // There is no checksum. + OS.EmitIntValue(0, 4); + continue; + } + OS.EmitIntValue(static_cast(File.Checksum.size()), 1); + OS.EmitIntValue(File.ChecksumKind, 1); + OS.EmitBytes(File.Checksum); + OS.EmitValueToAlignment(4); } OS.EmitLabel(FileEnd); } +// Output checksum table offset of the given file number. It is possible that +// not all files have been registered yet, and so the offset cannot be +// calculated. In this case a symbol representing the offset is emitted, and +// the value of this symbol will be fixed up at a later time. +void CodeViewContext::emitFileChecksumOffset(MCStreamer &OS, unsigned FileNo) { + unsigned Idx = FileNo - 1; + + if (Idx >= Files.size()) + Files.resize(Idx + 1); + + if (ChecksumOffsetsAssigned) { + OS.EmitSymbolValue(Files[Idx].ChecksumTableOffset, 4); + return; + } + + const MCSymbolRefExpr *SRE = + MCSymbolRefExpr::create(Files[Idx].ChecksumTableOffset, OS.getContext()); + + OS.EmitValueImpl(SRE, 4); +} + void CodeViewContext::emitLineTableForFunction(MCObjectStreamer &OS, unsigned FuncId, const MCSymbol *FuncBegin, @@ -219,9 +286,12 @@ return Loc.getFileNum() != CurFileNum; }); unsigned EntryCount = FileSegEnd - I; - OS.AddComment("Segment for file '" + Twine(Filenames[CurFileNum - 1]) + - "' begins"); - OS.EmitIntValue(8 * (CurFileNum - 1), 4); + OS.AddComment( + "Segment for file '" + + Twine(getStringTableFragment() + ->getContents()[Files[CurFileNum - 1].StringTableOffset]) + + "' begins"); + OS.EmitCVFileChecksumOffset(CurFileNum); OS.EmitIntValue(EntryCount, 4); uint32_t SegmentSize = 12; SegmentSize += 8 * EntryCount; @@ -357,6 +427,7 @@ SmallVectorImpl &Buffer = Frag.getContents(); Buffer.clear(); // Clear old contents if we went through relaxation. + 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 @@ -401,9 +472,10 @@ 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 = static_cast( + Files[CurSourceLoc.File - 1] + .ChecksumTableOffset->getVariableValue()) + ->getValue(); compressAnnotation(BinaryAnnotationsOpCode::ChangeFile, Buffer); compressAnnotation(FileOffset, Buffer); } Index: llvm/lib/MC/MCObjectStreamer.cpp =================================================================== --- llvm/lib/MC/MCObjectStreamer.cpp +++ llvm/lib/MC/MCObjectStreamer.cpp @@ -426,6 +426,11 @@ getContext().getCVContext().emitFileChecksums(*this); } +void MCObjectStreamer::EmitCVFileChecksumOffsetDirective(MCSymbol *File, + unsigned Offset) { + getContext().getCVContext().emitFileChecksumOffsetAssignment(*this, File, + Offset); +} void MCObjectStreamer::EmitBytes(StringRef Data) { MCCVLineEntry::Make(this); Index: llvm/lib/MC/MCParser/AsmParser.cpp =================================================================== --- llvm/lib/MC/MCParser/AsmParser.cpp +++ llvm/lib/MC/MCParser/AsmParser.cpp @@ -501,6 +501,7 @@ DK_CV_DEF_RANGE, DK_CV_STRINGTABLE, DK_CV_FILECHECKSUMS, + DK_CV_FILECHECKSUM_OFFSET, DK_CFI_SECTIONS, DK_CFI_STARTPROC, DK_CFI_ENDPROC, @@ -576,6 +577,7 @@ bool parseDirectiveCVDefRange(); bool parseDirectiveCVStringTable(); bool parseDirectiveCVFileChecksums(); + bool parseDirectiveCVFileChecksumOffset(); // .cfi directives bool parseDirectiveCFIRegister(SMLoc DirectiveLoc); @@ -2030,6 +2032,8 @@ return parseDirectiveCVStringTable(); case DK_CV_FILECHECKSUMS: return parseDirectiveCVFileChecksums(); + case DK_CV_FILECHECKSUM_OFFSET: + return parseDirectiveCVFileChecksumOffset(); case DK_CFI_SECTIONS: return parseDirectiveCFISections(); case DK_CFI_STARTPROC: @@ -3457,25 +3461,34 @@ } /// 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) || - parseToken(AsmToken::EndOfStatement, - "unexpected token in '.cv_file' directive")) + parseEscapedString(Filename)) return true; + if (!parseOptionalToken(AsmToken::EndOfStatement)) { + if (check(getTok().isNot(AsmToken::String), + "unexpected token in '.cv_file' directive") || + parseEscapedString(Checksum) || + parseIntToken(ChecksumKind, + "expected checksum kind in '.cv_file' directive") || + parseToken(AsmToken::EndOfStatement, + "unexpected token in '.cv_file' directive")) + return true; + } - if (!getStreamer().EmitCVFileDirective(FileNumber, Filename)) + if (!getStreamer().EmitCVFileDirective(FileNumber, Filename, Checksum, + static_cast(ChecksumKind))) return Error(FileNumberLoc, "file number already allocated"); return false; @@ -3754,6 +3767,24 @@ return false; } +/// parseDirectiveCVFileChecksumOffset +/// ::= .cv_filechecksumoffset fileid offset +bool AsmParser::parseDirectiveCVFileChecksumOffset() { + SMLoc Loc = getTok().getLoc(); + StringRef FileId; + int64_t Offset; + if (parseTokenLoc(Loc) || + check(parseIdentifier(FileId), Loc, "expected identifier in directive") || + parseIntToken(Offset, + "expected Offset in '.cv_filechecksumoffset' directive")) + return true; + if (parseToken(AsmToken::EndOfStatement, "Expected End of Statement")) + return true; + MCSymbol *File = getContext().getOrCreateSymbol(FileId); + getStreamer().EmitCVFileChecksumOffsetDirective(File, Offset); + return false; +} + /// parseDirectiveCFISections /// ::= .cfi_sections section [, section] bool AsmParser::parseDirectiveCFISections() { @@ -5136,6 +5167,7 @@ DirectiveKindMap[".cv_def_range"] = DK_CV_DEF_RANGE; DirectiveKindMap[".cv_stringtable"] = DK_CV_STRINGTABLE; DirectiveKindMap[".cv_filechecksums"] = DK_CV_FILECHECKSUMS; + DirectiveKindMap[".cv_filechecksumoffset"] = DK_CV_FILECHECKSUM_OFFSET; DirectiveKindMap[".sleb128"] = DK_SLEB128; DirectiveKindMap[".uleb128"] = DK_ULEB128; DirectiveKindMap[".cfi_sections"] = DK_CFI_SECTIONS; Index: llvm/lib/MC/MCStreamer.cpp =================================================================== --- llvm/lib/MC/MCStreamer.cpp +++ llvm/lib/MC/MCStreamer.cpp @@ -224,8 +224,11 @@ 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(*this, FileNo, Filename, Checksum, + ChecksumKind); } bool MCStreamer::EmitCVFuncIdDirective(unsigned FunctionId) { @@ -281,6 +284,14 @@ ArrayRef> Ranges, StringRef FixedSizePortion) {} +void MCStreamer::EmitCVFileChecksumOffset(unsigned FileNo) { + getContext().getCVContext().emitFileChecksumOffset(*this, FileNo); +} + +void MCStreamer::EmitCVFileChecksumOffsetDirectives() { + getContext().getCVContext().emitFileChecksumOffsetAssignments(*this); +} + void MCStreamer::EmitEHSymAttributes(const MCSymbol *Symbol, MCSymbol *EHSymbol) { } Index: llvm/test/DebugInfo/COFF/asm.ll =================================================================== --- llvm/test/DebugInfo/COFF/asm.ll +++ llvm/test/DebugInfo/COFF/asm.ll @@ -25,6 +25,7 @@ ; X86: .cv_linetable 0, _f, [[END_OF_F]] ; File index to string table offset subsection ; X86-NEXT: .cv_filechecksums +; X86-NEXT: .cv_filechecksumoffset file1 0 ; String table ; X86-NEXT: .cv_stringtable @@ -85,6 +86,7 @@ ; X64: .cv_linetable 0, f, [[END_OF_F]] ; File index to string table offset subsection ; X64-NEXT: .cv_filechecksums +; X64-NEXT: .cv_filechecksumoffset file1 0 ; String table ; X64-NEXT: .cv_stringtable Index: llvm/test/DebugInfo/COFF/inlining.ll =================================================================== --- llvm/test/DebugInfo/COFF/inlining.ll +++ llvm/test/DebugInfo/COFF/inlining.ll @@ -49,11 +49,11 @@ ; ASM: .long 0 ; ASM: # Inlined function bar starts at t.cpp:8 ; ASM: .long 4098 # Type index of inlined function -; ASM: .long 0 # Offset into filechecksum table +; ASM: .long file1 # Offset into filechecksum table ; ASM: .long 8 # Starting line number ; ASM: # Inlined function foo starts at t.cpp:2 ; ASM: .long 4099 -; ASM: .long 0 +; ASM: .long file1 ; ASM: .long 2 ; ASM: [[inline_end]]: @@ -72,6 +72,9 @@ ; ASM: .short 4430 ; ASM: .short 4430 +; ASM: .cv_filechecksums +; ASM: .cv_filechecksumoffset file1 0 + ; ASM: .section .debug$T,"dr" ; ASM: .long 4 # Debug section magic ; ASM: # ArgList (0x1000) { Index: llvm/test/DebugInfo/COFF/multifile.ll =================================================================== --- llvm/test/DebugInfo/COFF/multifile.ll +++ llvm/test/DebugInfo/COFF/multifile.ll @@ -18,10 +18,10 @@ ; X86-LABEL: _f: ; X86: # BB -; X86: .cv_file 1 "D:\\one.c" +; X86: .cv_file 1 "D:\\one.c" "70b51f534d80639d033ae92c6a856af6" 1 ; X86: .cv_loc 0 1 1 0 is_stmt 0 # one.c:1:0 ; X86: calll _g -; X86: .cv_file 2 "D:\\two.c" +; X86: .cv_file 2 "D:\\two.c" "70b51f534d80639d033ae92c6a856af6" 1 ; X86: .cv_loc 0 2 2 0 # two.c:2:0 ; X86: calll _g ; X86: .cv_loc 0 1 7 0 # one.c:7:0 @@ -34,6 +34,9 @@ ; X86: .cv_linetable 0, _f, [[END_OF_F]] ; File index to string table offset subsection ; X86-NEXT: .cv_filechecksums +; X86-NEXT: .cv_filechecksumoffset file1 0 +; X86-NEXT: .cv_filechecksumoffset file2 40 + ; String table ; X86-NEXT: .cv_stringtable @@ -51,6 +54,28 @@ ; OBJ32-NEXT: ProcEnd { ; OBJ32: } ; OBJ32-NEXT: ] +; OBJ32: Subsection [ +; OBJ32: SubSectionType: FileChecksums (0xF4) +; OBJ32-NEXT: SubSectionSize: 0x50 +; OBJ32-NEXT: FileChecksum { +; OBJ32-NEXT: Filename: D:\one.c (0x1) +; OBJ32-NEXT: ChecksumSize: 0x20 +; OBJ32-NEXT: ChecksumKind: MD5 (0x1) +; OBJ32-NEXT: ChecksumBytes ( +; OBJ32-NEXT: 0000: 37306235 31663533 34643830 36333964 |70b51f534d80639d| +; OBJ32-NEXT: 0010: 30333361 65393263 36613835 36616636 |033ae92c6a856af6| +; OBJ32-NEXT: ) +; OBJ32-NEXT: } +; OBJ32-NEXT: FileChecksum { +; OBJ32-NEXT: Filename: D:\two.c (0xA) +; OBJ32-NEXT: ChecksumSize: 0x20 +; OBJ32-NEXT: ChecksumKind: MD5 (0x1) +; OBJ32-NEXT: ChecksumBytes ( +; OBJ32-NEXT: 0000: 37306235 31663533 34643830 36333964 |70b51f534d80639d| +; OBJ32-NEXT: 0010: 30333361 65393263 36613835 36616636 |033ae92c6a856af6| +; OBJ32-NEXT: ) +; OBJ32-NEXT: } +; OBJ32-NEXT: ] ; OBJ32: FunctionLineTable [ ; OBJ32-NEXT: Name: _f ; OBJ32-NEXT: Flags: 0x0 @@ -88,14 +113,14 @@ ; X64-LABEL: f: ; X64-NEXT: .L{{.*}}:{{$}} -; X64: .cv_file 1 "D:\\input.c" +; X64: .cv_file 1 "D:\\input.c" "70b51f534d80639d033ae92c6a856af6" 1 ; X64: .cv_loc 0 1 3 0 is_stmt 0 # input.c:3:0 ; X64: # BB ; X64: subq $40, %rsp -; X64: .cv_file 2 "D:\\one.c" +; X64: .cv_file 2 "D:\\one.c" "70b51f534d80639d033ae92c6a856af6" 1 ; X64: .cv_loc 0 2 1 0 # one.c:1:0 ; X64: callq g -; X64: .cv_file 3 "D:\\two.c" +; X64: .cv_file 3 "D:\\two.c" "70b51f534d80639d033ae92c6a856af6" 1 ; X64: .cv_loc 0 3 2 0 # two.c:2:0 ; X64: callq g ; X64: .cv_loc 0 2 7 0 # one.c:7:0 @@ -123,6 +148,37 @@ ; OBJ64-NEXT: ProcEnd { ; OBJ64: } ; OBJ64-NEXT: ] +; OBJ64: Subsection [ +; OBJ64: SubSectionType: FileChecksums (0xF4) +; OBJ64-NEXT: SubSectionSize: 0x78 +; OBJ64-NEXT: FileChecksum { +; OBJ64-NEXT: Filename: D:\input.c (0x1) +; OBJ64-NEXT: ChecksumSize: 0x20 +; OBJ64-NEXT: ChecksumKind: MD5 (0x1) +; OBJ64-NEXT: ChecksumBytes ( +; OBJ64-NEXT: 0000: 37306235 31663533 34643830 36333964 |70b51f534d80639d| +; OBJ64-NEXT: 0010: 30333361 65393263 36613835 36616636 |033ae92c6a856af6| +; OBJ64-NEXT: ) +; OBJ64-NEXT: } +; OBJ64-NEXT: FileChecksum { +; OBJ64-NEXT: Filename: D:\one.c (0xC) +; OBJ64-NEXT: ChecksumSize: 0x20 +; OBJ64-NEXT: ChecksumKind: MD5 (0x1) +; OBJ64-NEXT: ChecksumBytes ( +; OBJ64-NEXT: 0000: 37306235 31663533 34643830 36333964 |70b51f534d80639d| +; OBJ64-NEXT: 0010: 30333361 65393263 36613835 36616636 |033ae92c6a856af6| +; OBJ64-NEXT: ) +; OBJ64-NEXT: } +; OBJ64-NEXT: FileChecksum { +; OBJ64-NEXT: Filename: D:\two.c (0x15) +; OBJ64-NEXT: ChecksumSize: 0x20 +; OBJ64-NEXT: ChecksumKind: MD5 (0x1) +; OBJ64-NEXT: ChecksumBytes ( +; OBJ64-NEXT: 0000: 37306235 31663533 34643830 36333964 |70b51f534d80639d| +; OBJ64-NEXT: 0010: 30333361 65393263 36613835 36616636 |033ae92c6a856af6| +; OBJ64-NEXT: ) +; OBJ64-NEXT: } +; OBJ64-NEXT: ] ; OBJ64: FunctionLineTable [ ; OBJ64-NEXT: Name: f ; OBJ64-NEXT: Flags: 0x0 @@ -185,11 +241,11 @@ !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: "", directory: "D:\5C") +!1 = !DIFile(filename: "", 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} @@ -197,9 +253,9 @@ !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: "one.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: "two.c", directory: "D:\5C", checksumkind: CSK_MD5, checksum:"70b51f534d80639d033ae92c6a856af6") !18 = !DILocation(line: 7, scope: !13) !19 = !DILocation(line: 8, scope: !13) Index: llvm/test/DebugInfo/COFF/simple.ll =================================================================== --- llvm/test/DebugInfo/COFF/simple.ll +++ llvm/test/DebugInfo/COFF/simple.ll @@ -17,7 +17,7 @@ ; X86-LABEL: _f: ; X86: # BB -; X86: .cv_file 1 "D:\\test.c" +; X86: .cv_file 1 "D:\\test.c" "f310ab26998ca831cbdf169e4eecacfa" 1 ; X86: .cv_loc 0 1 4 2 is_stmt 0 # test.c:4:2 ; X86: calll _g ; X86: .cv_loc 0 1 5 0 # test.c:5:0 @@ -62,6 +62,7 @@ ; X86-NEXT: .cv_linetable 0, _f, [[END_OF_F]] ; File index to string table offset subsection ; X86-NEXT: .cv_filechecksums +; X86-NEXT: .cv_filechecksumoffset file1 0 ; String table ; X86-NEXT: .cv_stringtable @@ -85,6 +86,19 @@ ; OBJ32-NEXT: ProcEnd { ; OBJ32: } ; OBJ32-NEXT: ] +; OBJ32: Subsection [ +; OBJ32: SubSectionType: FileChecksums (0xF4) +; OBJ32-NEXT: SubSectionSize: 0x28 +; OBJ32-NEXT: FileChecksum { +; OBJ32-NEXT: Filename: D:\test.c (0x1) +; OBJ32-NEXT: ChecksumSize: 0x20 +; OBJ32-NEXT: ChecksumKind: MD5 (0x1) +; OBJ32-NEXT: ChecksumBytes ( +; OBJ32-NEXT: 0000: 66333130 61623236 39393863 61383331 |f310ab26998ca831| +; OBJ32-NEXT: 0010: 63626466 31363965 34656563 61636661 |cbdf169e4eecacfa| +; OBJ32-NEXT: ) +; OBJ32-NEXT: } +; OBJ32-NEXT: ] ; OBJ32: FunctionLineTable [ ; OBJ32-NEXT: Name: _f ; OBJ32-NEXT: Flags: 0x1 @@ -110,7 +124,7 @@ ; X64-LABEL: f: ; X64-NEXT: .L{{.*}}:{{$}} -; X64: .cv_file 1 "D:\\test.c" +; X64: .cv_file 1 "D:\\test.c" "f310ab26998ca831cbdf169e4eecacfa" 1 ; X64: .cv_loc 0 1 3 0 is_stmt 0 # test.c:3:0 ; X64: # BB ; X64: subq $40, %rsp @@ -159,6 +173,7 @@ ; X64-NEXT: .cv_linetable 0, f, [[END_OF_F]] ; File index to string table offset subsection ; X64-NEXT: .cv_filechecksums +; X64-NEXT: .cv_filechecksumoffset file1 0 ; String table ; X64-NEXT: .cv_stringtable @@ -182,6 +197,19 @@ ; OBJ64-NEXT: ProcEnd { ; OBJ64: } ; OBJ64-NEXT: ] +; OBJ64: Subsection [ +; OBJ64: SubSectionType: FileChecksums (0xF4) +; OBJ64-NEXT: SubSectionSize: 0x28 +; OBJ64-NEXT: FileChecksum { +; OBJ64-NEXT: Filename: D:\test.c (0x1) +; OBJ64-NEXT: ChecksumSize: 0x20 +; OBJ64-NEXT: ChecksumKind: MD5 (0x1) +; OBJ64-NEXT: ChecksumBytes ( +; OBJ64-NEXT: 0000: 66333130 61623236 39393863 61383331 |f310ab26998ca831| +; OBJ64-NEXT: 0010: 63626466 31363965 34656563 61636661 |cbdf169e4eecacfa| +; OBJ64-NEXT: ) +; OBJ64-NEXT: } +; OBJ64-NEXT: ] ; OBJ64: FunctionLineTable [ ; OBJ64-NEXT: Name: f ; OBJ64-NEXT: Flags: 0x1 @@ -232,8 +260,8 @@ !1 = !DIFile(filename: "", directory: "D:\5C") !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: "test.c", directory: "D:\5C") -!6 = !DIFile(filename: "test.c", directory: "D:C") +!5 = !DIFile(filename: "test.c", directory: "D:\5C", checksumkind: CSK_MD5, checksum: "f310ab26998ca831cbdf169e4eecacfa") +!6 = !DIFile(filename: "test.c", directory: "D:C", checksumkind: CSK_MD5, checksum: "f310ab26998ca831cbdf169e4eecacfa") !7 = !DISubroutineType(types: !8) !8 = !{null} !9 = !{i32 2, !"CodeView", i32 1} Index: llvm/test/MC/AArch64/coff-debug.ll =================================================================== --- llvm/test/MC/AArch64/coff-debug.ll +++ llvm/test/MC/AArch64/coff-debug.ll @@ -103,7 +103,7 @@ ; CHECK: SubSectionType: FileChecksums (0xF4) ; CHECK: FileChecksum { ; CHECK: ChecksumSize: 0x0 -; CHECK: ChecksumKind: None (0x0) +; CHECK: ChecksumKind: MD5 (0x1) ; CHECK: ChecksumBytes: () ; CHECK: } ; CHECK: ] Index: llvm/test/MC/COFF/cv-loc.s =================================================================== --- llvm/test/MC/COFF/cv-loc.s +++ llvm/test/MC/COFF/cv-loc.s @@ -41,6 +41,8 @@ .section .debug$S .cv_filechecksums +.cv_filechecksumoffset file1 0 +.cv_filechecksumoffset file2 8 .cv_linetable 0, f, .Lfunc_end0 # CHECK: FunctionLineTable [ Index: llvm/unittests/IR/MetadataTest.cpp =================================================================== --- llvm/unittests/IR/MetadataTest.cpp +++ llvm/unittests/IR/MetadataTest.cpp @@ -1370,7 +1370,7 @@ TEST_F(DIFileTest, get) { StringRef Filename = "file"; StringRef Directory = "dir"; - DIFile::ChecksumKind CSKind = DIFile::CSK_MD5; + DIFile::ChecksumKind CSKind = DIFile::ChecksumKind::MD5; StringRef Checksum = "000102030405060708090a0b0c0d0e0f"; auto *N = DIFile::get(Context, Filename, Directory, CSKind, Checksum); @@ -1383,7 +1383,8 @@ 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::SHA1, Checksum)); EXPECT_NE(N, DIFile::get(Context, Filename, Directory)); TempDIFile Temp = N->clone();