[DebugInfo] Unify ChecksumKind and Checksum value in DIFile
Rather than encode the absence of a checksum with a Kind variant, instead put
both the kind and value in a struct and wrap it in an Optional.
Differential Revision: http://reviews.llvm.org/D43043
llvm-svn: 324928
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index 3b07ba3..a114a5f 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -988,23 +988,23 @@
void Verifier::visitDIFile(const DIFile &N) {
AssertDI(N.getTag() == dwarf::DW_TAG_file_type, "invalid tag", &N);
- AssertDI(N.getChecksumKind() <= DIFile::CSK_Last, "invalid checksum kind",
- &N);
- size_t Size;
- switch (N.getChecksumKind()) {
- case DIFile::CSK_None:
- Size = 0;
- break;
- case DIFile::CSK_MD5:
- Size = 32;
- break;
- case DIFile::CSK_SHA1:
- Size = 40;
- break;
+ Optional<DIFile::ChecksumInfo<StringRef>> Checksum = N.getChecksum();
+ if (Checksum) {
+ AssertDI(Checksum->Kind <= DIFile::ChecksumKind::CSK_Last,
+ "invalid checksum kind", &N);
+ size_t Size;
+ switch (Checksum->Kind) {
+ case DIFile::CSK_MD5:
+ Size = 32;
+ break;
+ case DIFile::CSK_SHA1:
+ Size = 40;
+ break;
+ }
+ AssertDI(Checksum->Value.size() == Size, "invalid checksum length", &N);
+ AssertDI(Checksum->Value.find_if_not(llvm::isHexDigit) == StringRef::npos,
+ "invalid checksum", &N);
}
- AssertDI(N.getChecksum().size() == Size, "invalid checksum length", &N);
- AssertDI(N.getChecksum().find_if_not(llvm::isHexDigit) == StringRef::npos,
- "invalid checksum", &N);
}
void Verifier::visitDICompileUnit(const DICompileUnit &N) {