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

Trying to improve stability under PCell debugging conditions inside the IDE

This commit is contained in:
Matthias Koefferlein 2024-09-13 14:31:45 +02:00
parent 680874c8e3
commit 153d1e3541
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/db/db/dbLayout.cc
View File

@ -2876,6 +2876,9 @@ Layout::get_context_info (cell_index_type cell_index, LayoutOrCellContextInfo &i
// one level of library indirection
ly = &lib->layout ();
if (! ly->is_valid_cell_index (lib_proxy->library_cell_index ())) {
return any_meta; // abort
}
cptr = &ly->cell (lib_proxy->library_cell_index ());
info.lib_name = lib->get_name ();

19
src/db/db/dbLibraryProxy.cc
View File

@ -132,6 +132,7 @@ LibraryProxy::get_layer_indices (db::Layout &layout, db::ImportLayerMapping *lay
Library *lib = LibraryManager::instance ().lib (lib_id ());
tl_assert (lib != 0);
tl_assert (lib->layout ().is_valid_cell_index (library_cell_index ()));
const db::Cell &cell = lib->layout ().cell (library_cell_index ());
@ -247,11 +248,11 @@ LibraryProxy::get_basic_name () const
{
Library *lib = LibraryManager::instance ().lib (lib_id ());
if (lib) {
const db::Cell *lib_cell = &lib->layout ().cell (library_cell_index ());
if (! lib_cell) {
if (! lib->layout ().is_valid_cell_index (library_cell_index ())) {
return "<defunct>";
} else {
return lib_cell->get_basic_name ();
const db::Cell &lib_cell = lib->layout ().cell (library_cell_index ());
return lib_cell.get_basic_name ();
}
} else {
return Cell::get_basic_name ();
@ -263,11 +264,11 @@ LibraryProxy::get_display_name () const
{
Library *lib = LibraryManager::instance ().lib (lib_id ());
if (lib) {
const db::Cell *lib_cell = &lib->layout ().cell (library_cell_index ());
if (! lib_cell) {
if (! lib->layout ().is_valid_cell_index (library_cell_index ())) {
return lib->get_name () + "." + "<defunct>";
} else {
return lib->get_name () + "." + lib_cell->get_display_name ();
const db::Cell &lib_cell = lib->layout ().cell (library_cell_index ());
return lib->get_name () + "." + lib_cell.get_display_name ();
}
} else {
return Cell::get_display_name ();
@ -279,11 +280,11 @@ LibraryProxy::get_qualified_name () const
{
Library *lib = LibraryManager::instance ().lib (lib_id ());
if (lib) {
const db::Cell *lib_cell = &lib->layout ().cell (library_cell_index ());
if (! lib_cell) {
if (! lib->layout ().is_valid_cell_index (library_cell_index ())) {
return lib->get_name () + "." + "<defunct>";
} else {
return lib->get_name () + "." + lib_cell->get_qualified_name ();
const db::Cell &lib_cell = lib->layout ().cell (library_cell_index ());
return lib->get_name () + "." + lib_cell.get_qualified_name ();
}
} else {
return Cell::get_qualified_name ();