Skip to content

[NFCI][BitcodeReader]Read real GUID from VI as opposed to storing it in map #107735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2024
Merged

[NFCI][BitcodeReader]Read real GUID from VI as opposed to storing it in map #107735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18c5a90
[NFCI][BitcodeReader]Read real GUID from VI as opposed to storing it …
mingmingl-llvm Sep 8, 2024
2edf1b3
Apply suggestions from code review
mingmingl-llvm Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,10 +943,8 @@ class ModuleSummaryIndexBitcodeReader : public BitcodeReaderBase {
// they are recorded in the summary index being built.
// We save a GUID which refers to the same global as the ValueInfo, but
// ignoring the linkage, i.e. for values other than local linkage they are
// identical (this is the second tuple member).
// The third tuple member is the real GUID of the ValueInfo.
DenseMap<unsigned,
std::tuple<ValueInfo, GlobalValue::GUID, GlobalValue::GUID>>
// identical (this is the second member). ValueInfo has the real GUID.
DenseMap<unsigned, std::pair<ValueInfo, GlobalValue::GUID>>
ValueIdToValueInfoMap;

/// Map populated during module path string table parsing, from the
Expand Down Expand Up @@ -999,7 +997,7 @@ class ModuleSummaryIndexBitcodeReader : public BitcodeReaderBase {
parseParamAccesses(ArrayRef<uint64_t> Record);

template <bool AllowNullValueInfo = false>
std::tuple<ValueInfo, GlobalValue::GUID, GlobalValue::GUID>
std::pair<ValueInfo, GlobalValue::GUID>
getValueInfoFromValueId(unsigned ValueId);

void addThisModule();
Expand Down Expand Up @@ -7101,7 +7099,7 @@ ModuleSummaryIndexBitcodeReader::getThisModule() {
}

template <bool AllowNullValueInfo>
std::tuple<ValueInfo, GlobalValue::GUID, GlobalValue::GUID>
std::pair<ValueInfo, GlobalValue::GUID>
ModuleSummaryIndexBitcodeReader::getValueInfoFromValueId(unsigned ValueId) {
auto VGI = ValueIdToValueInfoMap[ValueId];
// We can have a null value info for memprof callsite info records in
Expand All @@ -7128,10 +7126,10 @@ void ModuleSummaryIndexBitcodeReader::setValueGUID(
// UseStrtab is false for legacy summary formats and value names are
// created on stack. In that case we save the name in a string saver in
// the index so that the value name can be recorded.
ValueIdToValueInfoMap[ValueID] = std::make_tuple(
ValueIdToValueInfoMap[ValueID] = std::make_pair(
TheIndex.getOrInsertValueInfo(
ValueGUID, UseStrtab ? ValueName : TheIndex.saveString(ValueName)),
OriginalNameID, ValueGUID);
OriginalNameID);
}

// Specialized value symbol table parser used when reading module index
Expand Down Expand Up @@ -7219,8 +7217,8 @@ Error ModuleSummaryIndexBitcodeReader::parseValueSymbolTable(
GlobalValue::GUID RefGUID = Record[1];
// The "original name", which is the second value of the pair will be
// overriden later by a FS_COMBINED_ORIGINAL_NAME in the combined index.
ValueIdToValueInfoMap[ValueID] = std::make_tuple(
TheIndex.getOrInsertValueInfo(RefGUID), RefGUID, RefGUID);
ValueIdToValueInfoMap[ValueID] =
std::make_pair(TheIndex.getOrInsertValueInfo(RefGUID), RefGUID);
break;
}
}
Expand Down Expand Up @@ -7620,8 +7618,8 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
} else {
RefGUID = Record[1];
}
ValueIdToValueInfoMap[ValueID] = std::make_tuple(
TheIndex.getOrInsertValueInfo(RefGUID), RefGUID, RefGUID);
ValueIdToValueInfoMap[ValueID] =
std::make_pair(TheIndex.getOrInsertValueInfo(RefGUID), RefGUID);
break;
}
// FS_PERMODULE is legacy and does not have support for the tail call flag.
Expand Down Expand Up @@ -7679,9 +7677,8 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
// the prevailing copy of a symbol. The linker doesn't resolve local
// linkage values so don't check whether those are prevailing.
auto LT = (GlobalValue::LinkageTypes)Flags.Linkage;
if (IsPrevailing &&
!GlobalValue::isLocalLinkage(LT) &&
!IsPrevailing(std::get<2>(VIAndOriginalGUID))) {
if (IsPrevailing && !GlobalValue::isLocalLinkage(LT) &&
!IsPrevailing(VIAndOriginalGUID.first.getGUID())) {
PendingCallsites.clear();
PendingAllocs.clear();
}
Expand Down
Loading