Index: llvm/docs/LangRef.rst =================================================================== --- llvm/docs/LangRef.rst +++ llvm/docs/LangRef.rst @@ -4566,7 +4566,7 @@ Files are sometimes used in ``scope:`` fields, and are the only valid target for ``file:`` fields. -Valid values for ``checksumkind:`` field are: {CSK_None, CSK_MD5, CSK_SHA1} +Valid values for ``checksumkind:`` field are: {CSK_None, CSK_MD5, CSK_SHA1, CSK_SHA256} .. _DIBasicType: Index: llvm/include/llvm/IR/DebugInfoMetadata.h =================================================================== --- llvm/include/llvm/IR/DebugInfoMetadata.h +++ llvm/include/llvm/IR/DebugInfoMetadata.h @@ -465,7 +465,8 @@ // encoding is reserved. CSK_MD5 = 1, CSK_SHA1 = 2, - CSK_Last = CSK_SHA1 // Should be last enumeration. + CSK_SHA256 = 3, + CSK_Last = CSK_SHA256 // Should be last enumeration. }; /// A single checksum, represented by a \a Kind and a \a Value (a string). Index: llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp =================================================================== --- llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp +++ llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp @@ -252,6 +252,7 @@ switch (F->getChecksum()->Kind) { case DIFile::CSK_MD5: CSKind = FileChecksumKind::MD5; break; case DIFile::CSK_SHA1: CSKind = FileChecksumKind::SHA1; break; + case DIFile::CSK_SHA256: CSKind = FileChecksumKind::SHA256; break; } } bool Success = OS.EmitCVFileDirective(NextId, FullPath, ChecksumAsBytes, Index: llvm/lib/IR/DebugInfoMetadata.cpp =================================================================== --- llvm/lib/IR/DebugInfoMetadata.cpp +++ llvm/lib/IR/DebugInfoMetadata.cpp @@ -480,7 +480,8 @@ // so that the association is explicit rather than implied. static const char *ChecksumKindName[DIFile::CSK_Last] = { "CSK_MD5", - "CSK_SHA1" + "CSK_SHA1", + "CSK_SHA256", }; StringRef DIFile::getChecksumKindAsString(ChecksumKind CSKind) { @@ -495,6 +496,7 @@ return StringSwitch>(CSKindStr) .Case("CSK_MD5", DIFile::CSK_MD5) .Case("CSK_SHA1", DIFile::CSK_SHA1) + .Case("CSK_SHA256", DIFile::CSK_SHA256) .Default(None); } Index: llvm/lib/IR/Verifier.cpp =================================================================== --- llvm/lib/IR/Verifier.cpp +++ llvm/lib/IR/Verifier.cpp @@ -1034,6 +1034,9 @@ case DIFile::CSK_SHA1: Size = 40; break; + case DIFile::CSK_SHA256: + Size = 64; + break; } AssertDI(Checksum->Value.size() == Size, "invalid checksum length", &N); AssertDI(Checksum->Value.find_if_not(llvm::isHexDigit) == StringRef::npos, Index: llvm/test/Bitcode/round-trip-dbg-checksum.ll =================================================================== --- /dev/null +++ llvm/test/Bitcode/round-trip-dbg-checksum.ll @@ -0,0 +1,20 @@ +; Test that DIFile(checksumkind, checksum) can round-trip through bitcode. +; +; RUN: llvm-as < %s | llvm-dis | FileCheck %s + +!llvm.dbg.cu = !{!1, !2, !3, !4} +!llvm.module.flags = !{!9} + +!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !5, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug) +!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !6, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug) +!3 = distinct !DICompileUnit(language: DW_LANG_C99, file: !7, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug) +!4 = distinct !DICompileUnit(language: DW_LANG_C99, file: !8, isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug) +; CHECK: !DIFile(filename: "a.h", directory: "/test") +!5 = !DIFile(filename: "a.h", directory: "/test") +; CHECK: !DIFile(filename: "b.h", directory: "/test", checksumkind: CSK_MD5, checksum: "595f44fec1e92a71d3e9e77456ba80d1") +!6 = !DIFile(filename: "b.h", directory: "/test", checksumkind: CSK_MD5, checksum: "595f44fec1e92a71d3e9e77456ba80d1") +; CHECK: !DIFile(filename: "c.h", directory: "/test", checksumkind: CSK_SHA1, checksum: "d5db29cd03a2ed055086cef9c31c252b4587d6d0") +!7 = !DIFile(filename: "c.h", directory: "/test", checksumkind: CSK_SHA1, checksum: "d5db29cd03a2ed055086cef9c31c252b4587d6d0") +; CHECK: !DIFile(filename: "d.h", directory: "/test", checksumkind: CSK_SHA256, checksum: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") +!8 = !DIFile(filename: "d.h", directory: "/test", checksumkind: CSK_SHA256, checksum: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") +!9 = !{i32 2, !"Debug Info Version", i32 3}