nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create a typedef GlobalValue::GUID for uint64_t and RAUW (NFC)

Browse Source 
Summary: This should make the code more readable, especially all the map declarations.

Reviewers: tejohnson

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D18721

From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 265215
This commit is contained in:
Mehdi Amini
2016-04-02 05:07:53 +00:00
parent 2cd609482d
commit ad5741b075
7 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@@ -446,7 +446,7 @@ class ModuleSummaryIndexBitcodeReader {
// call graph edges read from the function summary from referencing
// callees by their ValueId to using the GUID instead, which is how
// they are recorded in the summary index being built.
DenseMap<unsigned, uint64_t> ValueIdToCallGraphGUIDMap;
DenseMap<unsigned, GlobalValue::GUID> ValueIdToCallGraphGUIDMap;
/// Map to save the association between summary offset in the VST to the
/// GlobalValueInfo object created when parsing it. Used to access the
@@ -502,7 +502,7 @@ private:
std::error_code initStream(std::unique_ptr<DataStreamer> Streamer);
std::error_code initStreamFromBuffer();
std::error_code initLazyStream(std::unique_ptr<DataStreamer> Streamer);
uint64_t getGUIDFromValueId(unsigned ValueId);
GlobalValue::GUID getGUIDFromValueId(unsigned ValueId);
GlobalValueInfo *getInfoFromSummaryOffset(uint64_t Offset);
};
} // end anonymous namespace
@@ -5444,7 +5444,8 @@ void ModuleSummaryIndexBitcodeReader::freeState() { Buffer = nullptr; }
void ModuleSummaryIndexBitcodeReader::releaseBuffer() { Buffer.release(); }
uint64_t ModuleSummaryIndexBitcodeReader::getGUIDFromValueId(unsigned ValueId) {
GlobalValue::GUID
ModuleSummaryIndexBitcodeReader::getGUIDFromValueId(unsigned ValueId) {
auto VGI = ValueIdToCallGraphGUIDMap.find(ValueId);
assert(VGI != ValueIdToCallGraphGUIDMap.end());
return VGI->second;
@@ -5540,7 +5541,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseValueSymbolTable(
// VST_CODE_COMBINED_GVDEFENTRY: [valueid, offset, guid]
unsigned ValueID = Record[0];
uint64_t GlobalValSummaryOffset = Record[1];
uint64_t GlobalValGUID = Record[2];
GlobalValue::GUID GlobalValGUID = Record[2];
std::unique_ptr<GlobalValueInfo> GlobalValInfo =
llvm::make_unique<GlobalValueInfo>(GlobalValSummaryOffset);
SummaryOffsetToInfoMap[GlobalValSummaryOffset] = GlobalValInfo.get();
@@ -5551,7 +5552,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseValueSymbolTable(
case bitc::VST_CODE_COMBINED_ENTRY: {
// VST_CODE_COMBINED_ENTRY: [valueid, refguid]
unsigned ValueID = Record[0];
uint64_t RefGUID = Record[1];
GlobalValue::GUID RefGUID = Record[1];
ValueIdToCallGraphGUIDMap[ValueID] = RefGUID;
break;
}
@@ -5787,7 +5788,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseEntireSummary() {
"Record size inconsistent with number of references");
for (unsigned I = 4, E = CallGraphEdgeStartIndex; I != E; ++I) {
unsigned RefValueId = Record[I];
uint64_t RefGUID = getGUIDFromValueId(RefValueId);
GlobalValue::GUID RefGUID = getGUIDFromValueId(RefValueId);
FS->addRefEdge(RefGUID);
}
bool HasProfile = (BitCode == bitc::FS_PERMODULE_PROFILE);
@@ -5796,11 +5797,11 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseEntireSummary() {
unsigned CalleeValueId = Record[I];
unsigned CallsiteCount = Record[++I];
uint64_t ProfileCount = HasProfile ? Record[++I] : 0;
uint64_t CalleeGUID = getGUIDFromValueId(CalleeValueId);
GlobalValue::GUID CalleeGUID = getGUIDFromValueId(CalleeValueId);
FS->addCallGraphEdge(CalleeGUID,
CalleeInfo(CallsiteCount, ProfileCount));
}
uint64_t GUID = getGUIDFromValueId(ValueID);
GlobalValue::GUID GUID = getGUIDFromValueId(ValueID);
auto InfoList = TheIndex->findGlobalValueInfoList(GUID);
assert(InfoList != TheIndex->end() &&
"Expected VST parse to create GlobalValueInfo entry");
@@ -5821,10 +5822,10 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseEntireSummary() {
TheIndex->addModulePath(Buffer->getBufferIdentifier(), 0)->first());
for (unsigned I = 2, E = Record.size(); I != E; ++I) {
unsigned RefValueId = Record[I];
uint64_t RefGUID = getGUIDFromValueId(RefValueId);
GlobalValue::GUID RefGUID = getGUIDFromValueId(RefValueId);
FS->addRefEdge(RefGUID);
}
uint64_t GUID = getGUIDFromValueId(ValueID);
GlobalValue::GUID GUID = getGUIDFromValueId(ValueID);
auto InfoList = TheIndex->findGlobalValueInfoList(GUID);
assert(InfoList != TheIndex->end() &&
"Expected VST parse to create GlobalValueInfo entry");
@@ -5855,7 +5856,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseEntireSummary() {
"Record size inconsistent with number of references");
for (unsigned I = 4, E = CallGraphEdgeStartIndex; I != E; ++I) {
unsigned RefValueId = Record[I];
uint64_t RefGUID = getGUIDFromValueId(RefValueId);
GlobalValue::GUID RefGUID = getGUIDFromValueId(RefValueId);
FS->addRefEdge(RefGUID);
}
bool HasProfile = (BitCode == bitc::FS_COMBINED_PROFILE);
@@ -5864,7 +5865,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseEntireSummary() {
unsigned CalleeValueId = Record[I];
unsigned CallsiteCount = Record[++I];
uint64_t ProfileCount = HasProfile ? Record[++I] : 0;
uint64_t CalleeGUID = getGUIDFromValueId(CalleeValueId);
GlobalValue::GUID CalleeGUID = getGUIDFromValueId(CalleeValueId);
FS->addCallGraphEdge(CalleeGUID,
CalleeInfo(CallsiteCount, ProfileCount));
}
@@ -5883,7 +5884,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseEntireSummary() {
FS->setModulePath(ModuleIdMap[ModuleId]);
for (unsigned I = 2, E = Record.size(); I != E; ++I) {
unsigned RefValueId = Record[I];
uint64_t RefGUID = getGUIDFromValueId(RefValueId);
GlobalValue::GUID RefGUID = getGUIDFromValueId(RefValueId);
FS->addRefEdge(RefGUID);
}
auto *Info = getInfoFromSummaryOffset(CurRecordBit);