maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[BOLT] Fix after DebugInfoMetadata change 0ca43d4488

This commit is contained in:
Fangrui Song 2022-12-04 18:57:52 +00:00
parent faa1338ccd
commit ea47ccc78f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bolt/include/bolt/Core/BinaryContext.h
View File

@ -284,8 +284,8 @@ public:
Expected<unsigned> getDwarfFile(StringRef Directory, StringRef FileName, Expected<unsigned> getDwarfFile(StringRef Directory, StringRef FileName,
unsigned FileNumber, unsigned FileNumber,
Optional<MD5::MD5Result> Checksum, Optional<MD5::MD5Result> Checksum,
Optional<StringRef> Source, unsigned CUID, std::optional<StringRef> Source,
unsigned DWARFVersion); unsigned CUID, unsigned DWARFVersion);
/// [start memory address] -> [segment info] mapping. /// [start memory address] -> [segment info] mapping.
std::map<uint64_t, SegmentInfo> SegmentMapInfo; std::map<uint64_t, SegmentInfo> SegmentMapInfo;

4
bolt/include/bolt/Core/DebugData.h
View File

@ -1134,7 +1134,7 @@ public:
Expected<unsigned> tryGetFile(StringRef &Directory, StringRef &FileName, Expected<unsigned> tryGetFile(StringRef &Directory, StringRef &FileName,
Optional<MD5::MD5Result> Checksum, Optional<MD5::MD5Result> Checksum,
Optional<StringRef> Source, std::optional<StringRef> Source,
uint16_t DwarfVersion, uint16_t DwarfVersion,
unsigned FileNumber = 0) { unsigned FileNumber = 0) {
assert(RawData.empty() && "cannot use with raw data"); assert(RawData.empty() && "cannot use with raw data");
@ -1151,7 +1151,7 @@ public:
/// optional \p Source. /// optional \p Source.
void setRootFile(StringRef Directory, StringRef FileName, void setRootFile(StringRef Directory, StringRef FileName,
Optional<MD5::MD5Result> Checksum, Optional<MD5::MD5Result> Checksum,
Optional<StringRef> Source) { std::optional<StringRef> Source) {
Header.setRootFile(Directory, FileName, Checksum, Source); Header.setRootFile(Directory, FileName, Checksum, Source);
} }

2
bolt/lib/Core/BinaryContext.cpp
View File

@ -1461,7 +1461,7 @@ void BinaryContext::printGlobalSymbols(raw_ostream &OS) const {
Expected<unsigned> BinaryContext::getDwarfFile( Expected<unsigned> BinaryContext::getDwarfFile(
StringRef Directory, StringRef FileName, unsigned FileNumber, StringRef Directory, StringRef FileName, unsigned FileNumber,
Optional<MD5::MD5Result> Checksum, Optional<StringRef> Source, Optional<MD5::MD5Result> Checksum, std::optional<StringRef> Source,
unsigned CUID, unsigned DWARFVersion) { unsigned CUID, unsigned DWARFVersion) {
DwarfLineTable &Table = DwarfLineTablesCUMap[CUID]; DwarfLineTable &Table = DwarfLineTablesCUMap[CUID];
return Table.tryGetFile(Directory, FileName, Checksum, Source, DWARFVersion, return Table.tryGetFile(Directory, FileName, Checksum, Source, DWARFVersion,