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

[Serialization] Stable serialization order for OpenCLTypeExtMap and OpenCLDeclExtMap 

Sort the elements of Sema::OpenCLTypeExtMap and Sema::OpenCLDeclExtMap
by TypeIDs and DeclIDs to guarantee a stable serialization order.

Differential Revision: https://reviews.llvm.org/D60835

Reviewed By: Anastasia

Reviewers: Anastasia, lebedev.ri
llvm-svn: 358674
This commit is contained in:
Bruno Ricci 2019-04-18 15:13:27 +00:00
parent 7085795284
commit 2751b69dd3
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
clang/lib/Serialization/ASTWriter.cpp
View File

@ -4278,14 +4278,32 @@ void ASTWriter::WriteOpenCLExtensionTypes(Sema &SemaRef) {
if (!SemaRef.Context.getLangOpts().OpenCL)
return;
// Sort the elements of the map OpenCLTypeExtMap by TypeIDs,
// without copying them.
const llvm::DenseMap<const Type *, std::set<std::string>> &OpenCLTypeExtMap =
SemaRef.OpenCLTypeExtMap;
using ElementTy = std::pair<TypeID, const std::set<std::string> *>;
llvm::SmallVector<ElementTy, 8> StableOpenCLTypeExtMap;
StableOpenCLTypeExtMap.reserve(OpenCLTypeExtMap.size());
for (const auto &I : OpenCLTypeExtMap)
StableOpenCLTypeExtMap.emplace_back(
getTypeID(I.first->getCanonicalTypeInternal()), &I.second);
auto CompareByTypeID = [](const ElementTy &E1, const ElementTy &E2) -> bool {
return E1.first < E2.first;
};
llvm::sort(StableOpenCLTypeExtMap, CompareByTypeID);
RecordData Record;
for (const auto &I : SemaRef.OpenCLTypeExtMap) {
Record.push_back(
static_cast<unsigned>(getTypeID(I.first->getCanonicalTypeInternal())));
Record.push_back(I.second.size());
for (auto Ext : I.second)
for (const ElementTy &E : StableOpenCLTypeExtMap) {
Record.push_back(E.first); // TypeID
const std::set<std::string> *ExtSet = E.second;
Record.push_back(static_cast<unsigned>(ExtSet->size()));
for (const std::string &Ext : *ExtSet)
AddString(Ext, Record);
}
Stream.EmitRecord(OPENCL_EXTENSION_TYPES, Record);
}
@ -4293,13 +4311,31 @@ void ASTWriter::WriteOpenCLExtensionDecls(Sema &SemaRef) {
if (!SemaRef.Context.getLangOpts().OpenCL)
return;
// Sort the elements of the map OpenCLDeclExtMap by DeclIDs,
// without copying them.
const llvm::DenseMap<const Decl *, std::set<std::string>> &OpenCLDeclExtMap =
SemaRef.OpenCLDeclExtMap;
using ElementTy = std::pair<DeclID, const std::set<std::string> *>;
llvm::SmallVector<ElementTy, 8> StableOpenCLDeclExtMap;
StableOpenCLDeclExtMap.reserve(OpenCLDeclExtMap.size());
for (const auto &I : OpenCLDeclExtMap)
StableOpenCLDeclExtMap.emplace_back(getDeclID(I.first), &I.second);
auto CompareByDeclID = [](const ElementTy &E1, const ElementTy &E2) -> bool {
return E1.first < E2.first;
};
llvm::sort(StableOpenCLDeclExtMap, CompareByDeclID);
RecordData Record;
for (const auto &I : SemaRef.OpenCLDeclExtMap) {
Record.push_back(getDeclID(I.first));
Record.push_back(static_cast<unsigned>(I.second.size()));
for (auto Ext : I.second)
for (const ElementTy &E : StableOpenCLDeclExtMap) {
Record.push_back(E.first); // DeclID
const std::set<std::string> *ExtSet = E.second;
Record.push_back(static_cast<unsigned>(ExtSet->size()));
for (const std::string &Ext : *ExtSet)
AddString(Ext, Record);
}
Stream.EmitRecord(OPENCL_EXTENSION_DECLS, Record);
}