From c31c87916c74eae7ea7fb46bb357554e3954084a Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sat, 5 Jan 2019 01:34:10 +0100
Subject: [PATCH] WIP: bugfix - array reference were not always considered
 correctly.

---
 src/db/db/dbHierNetworkProcessor.cc              |   2 +-
 src/db/unit_tests/dbHierNetworkProcessorTests.cc |   6 ++++++
 testdata/algo/hc_test_au14.gds                   | Bin 0 -> 2062 bytes
 testdata/algo/hc_test_au14b.gds                  | Bin 0 -> 1794 bytes
 testdata/algo/hc_test_l14.gds                    | Bin 0 -> 386 bytes
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 testdata/algo/hc_test_au14.gds
 create mode 100644 testdata/algo/hc_test_au14b.gds
 create mode 100644 testdata/algo/hc_test_l14.gds

diff --git a/src/db/db/dbHierNetworkProcessor.cc b/src/db/db/dbHierNetworkProcessor.cc
index d80880951..e0f1a447b 100644
--- a/src/db/db/dbHierNetworkProcessor.cc
+++ b/src/db/db/dbHierNetworkProcessor.cc
@@ -1206,7 +1206,7 @@ private:
     db::ICplxTrans t2i = t2 * i2.complex_trans ();
     const db::Cell &cell2 = mp_layout->cell (i2.cell_index ());
 
-    box_type b2 = cell2.bbox ().transformed (t2i);
+    box_type b2 = i2.cell_inst ().bbox (*mp_cbc).transformed (t2);
 
     if (! b1.touches (b2) || ! c1.interacts (cell2, t2i, *mp_conn)) {
       return;
diff --git a/src/db/unit_tests/dbHierNetworkProcessorTests.cc b/src/db/unit_tests/dbHierNetworkProcessorTests.cc
index bb05fe3c4..c376f26f1 100644
--- a/src/db/unit_tests/dbHierNetworkProcessorTests.cc
+++ b/src/db/unit_tests/dbHierNetworkProcessorTests.cc
@@ -1021,3 +1021,9 @@ TEST(113_HierClusters)
   run_hc_test_with_backannotation (_this, "hc_test_l13.gds", "hc_test_au13b.gds");
 }
 
+TEST(114_HierClusters)
+{
+  run_hc_test (_this, "hc_test_l14.gds", "hc_test_au14.gds");
+  run_hc_test_with_backannotation (_this, "hc_test_l14.gds", "hc_test_au14b.gds");
+}
+
diff --git a/testdata/algo/hc_test_au14.gds b/testdata/algo/hc_test_au14.gds
new file mode 100644
index 0000000000000000000000000000000000000000..7f5500e605e61921b25affa7167bb3a25a6777b0
GIT binary patch
literal 2062
zcma)-v1=4T6vn@u-J4qsN{lH|93nwb@j%2vg{Wu}h!`|QijY4*>`WJ1J1qno<scI5
zywbwr8at80BDR6pc}0p8Rw1A;dEd-Fc0*KNas2MSnfcytcVQ16&aI%6x%N+FXvyas
zrkmeUI=^`T9x$1=Zr^=*{lV7{zi!SAuDst^T}G$%?{nV!*{di@z@K!|>rXiV-SIqx
z-%BC<nIeJKBv5=*YEGg!ElX|ucS`B~@*}A!#$?U}CzfX%PQalvo&&Q7!1Nbn-+Gbp
z_u42mS7xqhwlxf4G#A3w5P0(r?$(-8bMnafym@|qCWP;=L)f1IHhXaG^GeOh=J|ZL
zdEPkRU*;VxyVbSxKBcQU+GeydwE=e)fU`dmFKhz~eL$(XFtzz^eENSkL$)dB=l2pH
z?jq~o0F;^w&0R7#c8X8zQfhAXT9@a}`6PXwU#zLQ)r%dRPtu27O3kfaOM~P^(rb09
zCcUb4)BWOJ&L`=^E~VyHuS@;pMbhh9S(9GXy2*=sIiI8tyOf$+y<9JOk@Olns7bGC
z-Q>l+oKMn+T}sW3Uf6jNy&}a6Bl#%BOV=%4aj(pc6rb3o)ZFUz=~?n3>GN6ol=Q0B
zO<vr~`6PYVrPSQ&_3BCTBI)yXSd(7Wy2*=sIiI8tyOf$+y&kV5FOptQ2Q}$ct(&~K
gm-9*buuG}A)r;?F&L`=`ceGM-;W01ymn{k$0*6bIq5uE@

literal 0
HcmV?d00001

diff --git a/testdata/algo/hc_test_au14b.gds b/testdata/algo/hc_test_au14b.gds
new file mode 100644
index 0000000000000000000000000000000000000000..5117445b48434ed1617a5da1dd9b03076fcf794b
GIT binary patch
literal 1794
zcmb7_F=!M)7=_=??aeI)CB_sf4v`?JAc$C~5EV^?h@vS{g!D!`(`jp`g<xYiP=cLT
zT3B3TCvsTCR?yBXEG(=-Kw<pf>^^pb?107c-MybT-`p1e!Na*V^fTA{jtpIUj$yv}
z8HMw=Zd?OqJKf7ypPs+@@y)M`OQSQdU#_pB-)--C?-$P^F93hg*}49Z18{n}6T<J6
z5dO@OKzA0%--^mf<cDq4L()=szk0`x$*0USLt}Bo;Q$=^(;Z-O519Xe?9(7Je&3vw
zCs#Lf&719vLzpauurmf;yn?&5DJm!T^*hb}?m`HkpNFu!0BjH7ddEfO<i7shx({4g
z29AC!dEyJOJOo7L#`tEc`#1a9wso%mMC9!s$c7gHQMobMxASA)ys<ATPx&9(d!vV>
z_wmV^%2R&!=ppH4UsRs*uZ&7RN&os>P5P^O>+k2B9+F=6Mdc~~sbT3S=|5N0q`#WC
z`Z=eEq?dhBdCKnwrJtmKYOf~!)x6cuIXxu3?2F11etdlr{gLL!#2(T7nz#Am+|G|Q
zZ|sZ8Q~r04N<T^Odpkp<znZuDIj4uDmwi!r%Kz+s=_l#k8rP)1nz#Bnr-!7MeNlPJ
zzp+;ON%|j*YSLfLTm78VL(<E>s66H8{-TGZpZiNxZfyED>ix&Pt39i|D=PnI|K4l%
M|7ZW&KTDqDFNTM5-v9sr

literal 0
HcmV?d00001

diff --git a/testdata/algo/hc_test_l14.gds b/testdata/algo/hc_test_l14.gds
new file mode 100644
index 0000000000000000000000000000000000000000..3b1eaa46fa62cb8ac0ab3de7ac80fd82e83b58b1
GIT binary patch
literal 386
zcmaKnu}T9$6h+Uzoqf9~N}?$&wh*xt#7cxHXwry6QltoeMSjE1MhGZkXKU#Phy;uH
z5#|G|f}rr6iH>XvErv7i4)@+SC?b8zMDkY>GJn>oSML;}r^iRoNV9{(^WBrDySKge
z!}jgfS&uUN+o!6n9b5srBtBP{1=y;kW*=R%&$U3v8sP3DqaKK>`=^|LTME@)$H%xu
z-?I`Li&bF(p{%9QdWVfilIP)!vw1N2PX5_Us+)~RW|Owrcm$W%$o?QQ>Vb3qwCbNW
W&0a3drcJmRBKc-y)B}Hi<{V%4SY9ds

literal 0
HcmV?d00001