gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor unloading of template specializations

Browse Source 
Also quite a bit of simplification.

Co-authored-by: Axel Naumann <Axel.Naumann@cern.ch>
This commit is contained in:
Jonas Hahnfeld 2023-11-24 17:55:30 +01:00 committed by jenkins
parent 788b2b2be7
commit df71846ee9
1 changed files with 30 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
lib/Interpreter/DeclUnloader.cpp
View File

@ -327,6 +327,22 @@ namespace {
} }
} }
template <class EntryType>
void removeSpecializationImpl(llvm::FoldingSetVector<EntryType>& Specs,
const EntryType* Entry) {
// Remove only Entry from Specs, keep all others.
llvm::FoldingSetVector<EntryType> Keep;
for (auto& Spec : Specs) {
if (&Spec != Entry) {
// Avoid assertion on add.
Spec.SetNextInBucket(nullptr);
Keep.InsertNode(&Spec);
}
}
std::swap(Specs, Keep);
}
// Template instantiation of templated function first creates a canonical // Template instantiation of templated function first creates a canonical
// declaration and after the actual template specialization. For example: // declaration and after the actual template specialization. For example:
// template<typename T> T TemplatedF(T t); // template<typename T> T TemplatedF(T t);
@ -344,43 +360,18 @@ namespace {
class FunctionTemplateDeclExt : public FunctionTemplateDecl { class FunctionTemplateDeclExt : public FunctionTemplateDecl {
public: public:
static void removeSpecialization(FunctionTemplateDecl* self, static void removeSpecialization(FunctionTemplateDecl* self,
const FunctionDecl* specialization) { const FunctionDecl* spec) {
assert(self && specialization && "Cannot be null!"); assert(self && spec && "Cannot be null!");
assert(specialization == specialization->getCanonicalDecl() && assert(spec == spec->getCanonicalDecl() &&
"Not the canonical specialization!?"); "Not the canonical specialization!?");
typedef llvm::SmallVector<FunctionDecl*, 4> Specializations;
typedef llvm::FoldingSetVector<FunctionTemplateSpecializationInfo> Set;
FunctionTemplateDeclExt* This = (FunctionTemplateDeclExt*)self; auto* This = static_cast<FunctionTemplateDeclExt*>(self);
Specializations specializations; auto& specs = This->getCommonPtr()->Specializations;
const Set& specs = This->getCommonPtr()->Specializations; removeSpecializationImpl(specs, spec->getTemplateSpecializationInfo());
if (!specs.size()) // nothing to remove
return;
// Collect all the specializations without the one to remove.
for (Set::const_iterator I = specs.begin(), E = specs.end(); I != E;
++I) {
assert(I->getFunction() && "Must have a specialization.");
if (I->getFunction() != specialization)
specializations.push_back(I->getFunction());
}
This->getCommonPtr()->Specializations.clear();
// Readd the collected specializations.
void* InsertPos = nullptr;
FunctionTemplateSpecializationInfo* FTSI = nullptr;
for (size_t i = 0, e = specializations.size(); i < e; ++i) {
FTSI = specializations[i]->getTemplateSpecializationInfo();
assert(FTSI && "Must not be null.");
// Avoid assertion on add.
FTSI->SetNextInBucket(nullptr);
This->addSpecialization(FTSI, InsertPos);
}
#ifndef NDEBUG #ifndef NDEBUG
const TemplateArgumentList* args = const TemplateArgumentList* args = spec->getTemplateSpecializationArgs();
specialization->getTemplateSpecializationArgs(); void* InsertPos = nullptr;
assert(!self->findSpecialization(args->asArray(), InsertPos) && assert(!self->findSpecialization(args->asArray(), InsertPos) &&
"Finds the removed decl again!"); "Finds the removed decl again!");
#endif #endif
@ -399,35 +390,10 @@ namespace {
assert(self && spec && "Cannot be null!"); assert(self && spec && "Cannot be null!");
assert(spec == spec->getCanonicalDecl() && assert(spec == spec->getCanonicalDecl() &&
"Not the canonical specialization!?"); "Not the canonical specialization!?");
typedef llvm::SmallVector<ClassTemplateSpecializationDecl*, 4>
Specializations;
typedef llvm::FoldingSetVector<ClassTemplateSpecializationDecl> Set;
ClassTemplateDeclExt* This = (ClassTemplateDeclExt*)self; auto* This = static_cast<ClassTemplateDeclExt*>(self);
Specializations specializations; auto& specs = This->getCommonPtr()->Specializations;
Set& specs = This->getCommonPtr()->Specializations; removeSpecializationImpl(specs, spec);
if (!specs.size()) // nothing to remove
return;
// Collect all the specializations without the one to remove.
for (Set::iterator I = specs.begin(), E = specs.end(); I != E; ++I) {
if (&*I != spec)
specializations.push_back(&*I);
}
This->getCommonPtr()->Specializations.clear();
// Readd the collected specializations.
void* InsertPos = nullptr;
ClassTemplateSpecializationDecl* CTSD = nullptr;
for (size_t i = 0, e = specializations.size(); i < e; ++i) {
CTSD = specializations[i];
assert(CTSD && "Must not be null.");
// Avoid assertion on add.
CTSD->SetNextInBucket(nullptr);
This->AddSpecialization(CTSD, InsertPos);
}
} }
static void static void
@ -436,36 +402,10 @@ namespace {
assert(self && spec && "Cannot be null!"); assert(self && spec && "Cannot be null!");
assert(spec == spec->getCanonicalDecl() && assert(spec == spec->getCanonicalDecl() &&
"Not the canonical specialization!?"); "Not the canonical specialization!?");
typedef llvm::SmallVector<ClassTemplatePartialSpecializationDecl*, 4>
Specializations;
typedef llvm::FoldingSetVector<ClassTemplatePartialSpecializationDecl>
Set;
ClassTemplateDeclExt* This = (ClassTemplateDeclExt*)self; auto* This = static_cast<ClassTemplateDeclExt*>(self);
Specializations specializations; auto& specs = This->getPartialSpecializations();
Set& specs = This->getPartialSpecializations(); removeSpecializationImpl(specs, spec);
if (!specs.size()) // nothing to remove
return;
// Collect all the specializations without the one to remove.
for (Set::iterator I = specs.begin(), E = specs.end(); I != E; ++I) {
if (&*I != spec)
specializations.push_back(&*I);
}
This->getPartialSpecializations().clear();
// Readd the collected specializations.
void* InsertPos = nullptr;
ClassTemplatePartialSpecializationDecl* CTPSD = nullptr;
for (size_t i = 0, e = specializations.size(); i < e; ++i) {
CTPSD = specializations[i];
assert(CTPSD && "Must not be null.");
// Avoid assertion on add.
CTPSD->SetNextInBucket(nullptr);
This->AddPartialSpecialization(CTPSD, InsertPos);
}
} }
}; };
} // end anonymous namespace } // end anonymous namespace