luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'quantamhd/fix_segfault' into wip

This commit is contained in:
Matthias Koefferlein 2022-12-13 21:52:40 +01:00
parent a2164ec88b 0a03a2809a
commit 5a6ea0148a
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db/db/dbLayout.h
View File

@ -192,8 +192,13 @@ public:
* @brief Default constructor
*/
cell_list_const_iterator (cell_list_iterator<cell_type> iter)
: mp_cell (& (*iter))
{ }
{
if (iter == cell_list_iterator<cell_type>()) {
mp_cell = nullptr;
} else {
mp_cell = &(*iter);
}
}
/**
* @brief Equality

29
src/tl/tl/tlClassRegistry.cc
View File

@ -23,35 +23,36 @@
#include "tlClassRegistry.h"
#include <map>
#include <unordered_map>
#include <typeinfo>
#include <typeindex>
namespace tl
{
struct ti_compare_f
{
bool operator() (const std::type_info *a, const std::type_info *b) const
{
return a->before (*b);
}
};
typedef std::map<std::type_index, RegistrarBase *> inst_map_type;
typedef std::map<const std::type_info *, RegistrarBase *, ti_compare_f> inst_map_type;
static inst_map_type s_inst_map;
// Used to fix https://en.cppreference.com/w/cpp/language/siof segfault
// on some systems.
inst_map_type& s_inst_map() {
static inst_map_type s_inst_map;
return s_inst_map;
}
TL_PUBLIC void set_registrar_instance_by_type (const std::type_info &ti, RegistrarBase *rb)
{
if (rb) {
s_inst_map[&ti] = rb;
s_inst_map()[std::type_index(ti)] = rb;
} else {
s_inst_map.erase (&ti);
s_inst_map().erase (std::type_index(ti));
}
}
TL_PUBLIC RegistrarBase *registrar_instance_by_type (const std::type_info &ti)
{
inst_map_type::const_iterator im = s_inst_map.find (&ti);
if (im != s_inst_map.end ()) {
inst_map_type map = s_inst_map();
inst_map_type::const_iterator im = map.find (std::type_index(ti));
if (im != map.end ()) {
return im->second;
} else {
return 0;