From 665617182c453ec7fa088501fa37eb1ede8550f1 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Fri, 10 Jun 2022 18:20:55 -0700 Subject: [PATCH] [Bitcode] Don't use UINT_MAX for missing SanitizerMetadata Looks like comment on D126100 was unnoticed. --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 2 +- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index cd253c1..b8d5faa 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -3557,7 +3557,7 @@ Error BitcodeReader::parseGlobalVarRecord(ArrayRef Record) { if (Record.size() > 15) NewGV->setPartition(StringRef(Strtab.data() + Record[14], Record[15])); - if (Record.size() > 16 && Record[16] != UINT_MAX) { + if (Record.size() > 16 && Record[16]) { llvm::GlobalValue::SanitizerMetadata Meta = deserializeSanitizerMetadata(Record[16]); NewGV->setSanitizerMetadata(Meta); diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index 691b332..a8a6b3f 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -1386,10 +1386,9 @@ void ModuleBitcodeWriter::writeModuleInfo() { Vals.push_back(addToStrtab(GV.getPartition())); Vals.push_back(GV.getPartition().size()); - if (GV.hasSanitizerMetadata()) - Vals.push_back(serializeSanitizerMetadata(GV.getSanitizerMetadata())); - else - Vals.push_back(UINT_MAX); + Vals.push_back((GV.hasSanitizerMetadata() ? serializeSanitizerMetadata( + GV.getSanitizerMetadata()) + : 0)); } else { AbbrevToUse = SimpleGVarAbbrev; } -- 2.7.4