tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10155 from Icinga/Type-GetLoadDependencies-nullptr 

Type#GetLoadDependencies(): VERIFY() that no nullptr is returned
This commit is contained in:
Yonas Habteab 2024-09-20 12:29:48 +02:00 committed by GitHub
parent e678f0977d c24713ac10
commit dac747f9d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/mkclass/classcompiler.cpp
View File

@ -376,19 +376,32 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
<< "}" << std::endl << std::endl;
/* GetLoadDependencies */
m_Header << "\t" << "const std::unordered_set<Type*>& GetLoadDependencies() const override;" << std::endl;
if (!klass.LoadDependencies.empty()) {
m_Header << "\tconst std::unordered_set<Type*>& GetLoadDependencies() const override;" << std::endl;
m_Impl << "const std::unordered_set<Type*>& TypeImpl<" << klass.Name << ">::GetLoadDependencies() const" << std::endl
<< "{" << std::endl
<< "\t" << "static const std::unordered_set<Type*> deps ({" << std::endl;
m_Impl << "const std::unordered_set<Type*>& TypeImpl<" << klass.Name << ">::GetLoadDependencies() const" << std::endl
<< "{" << std::endl
<< "\tstatic const auto deps ([] {" << std::endl;
for (const std::string& dep : klass.LoadDependencies)
m_Impl << "\t\t" << "GetByName(\"" << dep << "\").get()," << std::endl;
for (auto& dep : klass.LoadDependencies)
m_Impl << "\t\tauto type" << dep << " (GetByName(\"" << dep << "\").get());" << std::endl;
m_Impl << "\t" << "});" << std::endl;
m_Impl << std::endl;
m_Impl << "\t" << "return deps;" << std::endl
<< "}" << std::endl << std::endl;
for (auto& dep : klass.LoadDependencies)
m_Impl << "\t\tVERIFY(type" << dep << ");" << std::endl;
m_Impl << std::endl
<< "\t\treturn std::unordered_set<Type*>{";
for (const std::string& dep : klass.LoadDependencies)
m_Impl << " type" << dep << ",";
m_Impl << " };" << std::endl
<< "\t}());" << std::endl << std::endl
<< "\treturn deps;" << std::endl
<< "}" << std::endl << std::endl;
}
/* GetActivationPriority */
m_Header << "\t" << "int GetActivationPriority() const override;" << std::endl;
@ -1463,6 +1476,7 @@ void ClassCompiler::CompileStream(const std::string& path, std::istream& input,
<< "#include \"base/objectlock.hpp\"" << std::endl
<< "#include \"base/utility.hpp\"" << std::endl
<< "#include \"base/convert.hpp\"" << std::endl
<< "#include \"base/debug.hpp\"" << std::endl
<< "#include \"base/dependencygraph.hpp\"" << std::endl
<< "#include \"base/logger.hpp\"" << std::endl
<< "#include \"base/function.hpp\"" << std::endl