From 16d662229d030a6a02d9b74b918dc1b40f7cb6ff Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Mon, 21 Nov 2022 23:15:56 +0100
Subject: [PATCH 1/2] Fixed issue #1190 (Edges#extended_xx in deep mode)

---
 src/db/db/dbDeepEdges.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/db/db/dbDeepEdges.cc b/src/db/db/dbDeepEdges.cc
index c1ca6f78b..93dd301d1 100644
--- a/src/db/db/dbDeepEdges.cc
+++ b/src/db/db/dbDeepEdges.cc
@@ -1200,8 +1200,9 @@ RegionDelegate *DeepEdges::extended (coord_type ext_b, coord_type ext_e, coord_t
           out = & to_commit [c->cell_index ()][v->first];
         }
 
+        PolygonRefToShapesGenerator prgen (&layout, out);
         for (db::Shapes::shape_iterator si = c->shapes (edges.layer ()).begin (db::ShapeIterator::Edges); ! si.at_end (); ++si) {
-          out->insert (extended_edge (si->edge ().transformed (v->first), ext_b, ext_e, ext_o, ext_i).transformed (v->first.inverted ()));
+          prgen.put (extended_edge (si->edge ().transformed (v->first), ext_b, ext_e, ext_o, ext_i).transformed (v->first.inverted ()));
         }
 
       }

From 6e2310186b1ec9d14bd58461d71b12d064b46dd2 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Mon, 21 Nov 2022 23:27:19 +0100
Subject: [PATCH 2/2] Added tests

---
 src/drc/unit_tests/drcSimpleTests.cc  |   9 +++++++++
 testdata/drc/drcSimpleTests_57.drc    |  18 ++++++++++++++++++
 testdata/drc/drcSimpleTests_57.gds    | Bin 0 -> 10262 bytes
 testdata/drc/drcSimpleTests_au57.gds  | Bin 0 -> 5450 bytes
 testdata/drc/drcSimpleTests_au57d.gds | Bin 0 -> 3826 bytes
 5 files changed, 27 insertions(+)
 create mode 100644 testdata/drc/drcSimpleTests_57.drc
 create mode 100644 testdata/drc/drcSimpleTests_57.gds
 create mode 100644 testdata/drc/drcSimpleTests_au57.gds
 create mode 100644 testdata/drc/drcSimpleTests_au57d.gds

diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc
index 741646c9e..779583d31 100644
--- a/src/drc/unit_tests/drcSimpleTests.cc
+++ b/src/drc/unit_tests/drcSimpleTests.cc
@@ -1328,3 +1328,12 @@ TEST(55d_drccount)
   run_test (_this, "55", true);
 }
 
+TEST(57_issue_1190)
+{
+  run_test (_this, "57", false);
+}
+
+TEST(57d_issue_1190)
+{
+  run_test (_this, "57", true);
+}
diff --git a/testdata/drc/drcSimpleTests_57.drc b/testdata/drc/drcSimpleTests_57.drc
new file mode 100644
index 000000000..e65afe876
--- /dev/null
+++ b/testdata/drc/drcSimpleTests_57.drc
@@ -0,0 +1,18 @@
+
+source $drc_test_source
+target $drc_test_target
+
+if $drc_test_deep
+  deep
+end
+
+l1 = input(1, 0)
+
+l1.output(1, 0)
+
+l1e = l1.edges
+l1e.with_angle(ortho).extended_out(1.dbu).merged.output(100, 0)
+l1e.with_angle(diagonal_only).extended_in(1.dbu).merged.output(101, 0)
+l1e.with_angle(diagonal).extended(1.dbu, 2.dbu, 3.dbu, 4.dbu).merged.output(102, 0)
+
+
diff --git a/testdata/drc/drcSimpleTests_57.gds b/testdata/drc/drcSimpleTests_57.gds
new file mode 100644
index 0000000000000000000000000000000000000000..a9ab615dbd0d4a14e79aa2dc8ea7160ff88b8ffb
GIT binary patch
literal 10262
zcmb7~O=w(I6vzLWB$Jp%6WjEICfL+ex{%ryq*}0&#)u6qwl-PRqCun@i-=aSbrY$&
zXo@bf5iKbwf*%X<Yt@BNL2#?$N)QwTt+k2^K@?;>=e|278Rq@oaiE;(%>CVS=f3;?
z=i^0n)oMpH(oyUANvqT^sY`v!->bJ)KQJ{R4Rv<kx%cdC`@eYikKL0Ow!gV_bVeiH
z<y>FAK6UT()a2dj>Xqu(*3_Z;bv5&FV6anKbwTRhYX7s>;P-{y@L}=!mN{woh~#$b
zpyZ#s^>O~WbD8hD-d5Z)|D?}9K32@R<1K061<CF3<I?WU(%5Bb>Z!usXDb@9Io<mF
znQJ%itv>I=#`XUt%`Vt{J<_pb(v1VssVlb5{nCl|i|_NeG>;9Vo$9UEXAT~+-_a-a
zt#0mGzk8D!jeovXnq|ee^^G0&W&d#ZUfY-S>L2Nz*w%bsu+q-6<*bcAx_tbLwyV27
zD#l-vu2|=#e8uXUZFkf=kXEE2pWT0F&sW8Mm`y9Jru-`OnOC>#CZm*Jvl~7yu9?}O
zFTbMecNSOHPD_yT9r3f}uQdx%%85<m#pyH~^yO#Te5A7-U!mUt{>rNi`g-s)Y2q=-
z?cv_&3XeZm5GVE}8}v1At1};RYd(XN`>^vT_ZdBhjmGb<n2&!8JG~h5)oA?vy4}I&
z?JVA$Y;c7GA4~VIGd(f8@1>Y8yRF}r_MB=o{#@-gN|~f+?vVL1`^-#~+PEM+|DANx
zo@9f+Yn$DXCof8FXMc?P%A>XZiT^{*+RC2%+6c3!N29(T`BFObiK&jA5wpSH_4GTo
zhliy{KTS4BJ-b7C?*Yl}xs@yYrCbkP?_Cc)F0B1w#R`GSqf-<axfG>5=Gf>IbJlE$
zQXZjfbW^#P?*^=Jd@Mzvq}Zn1K`QHeinc9^4Zb`kyUu6j4*K%Zu7!D}K`N`K-Cc<e
zQa;)h+v!c?(cN&xw$VxFTVe|AhDQhYll4Bh!mOT2=UcQFeC4Q+wAbDTedVZ-biO5~
zfUkMmLytsR??b+t>e<x$*b19b;i}$;d|izSN#{-PgH(<RS?{A%R?npKruR`_wucrK
zl=VJH<*1N!-t<05W%W#oZOR>_vc4-TcaX~ZF3&|zeiQYTM=R@n(AOQNHm46t+buer
znUDI)qjk&A(&AE-%A<AH8`5hlGY7a+@@U<&OL}>2)K?y@{QH8tF*ho`db{+{25D(1
z>MM`damzVAI3K0*=oDcs(gs(U<FWEems6L^<1*AKKta?43aXn5%4(r@u@We#iGYF#
z3lvmR6;w%F1`6UbP$q}XdZ@K(tDs7vIZ!$Fr?}jb0{{g%08mgNR!}9G15i*`0tNX7
zP*9ClP+nK&sx+tod34G*T5=ok1-T7Sp4*gEz7<qSMg&yOpW4;Sr4;5-KtYvVK}|2V
z&Axzw+Psv)oDC?b=qo6z|J!AHKtUe>D98_ig6=^DRgzT#1w99#AQuG+Iu#X^^)=dc
zDu9B#7bxg&R8ZCpX_qYn1zi!KAjbv@a%`ZW0|OLfus}iI=GXH45c)PiLEi=_=-U7V
zeH);lx&aER8=#=N0Sc-cprB3x3hES~piTh_>Xa+x=MX9mprFqN6jT8~L7xpM$mfCb
ze7+<z2MTg*prFqN6y&`?L7xpM$VGvIK3ge;`5{oAAC_c#r4;6DKtZ1kD9EFL%1>X~
z_1S=e+y*GfH-LgZ8&Hq~00lV!P!P?3E7wDa%RoU~1`6UbP!N}af_@ZG&{+ZsdPG1$
zw+AR!?55VYJmUZgdMQ9bR|F{NZvX|I3ZS6p02Fi&fPy|iDb;+A(tJX)q6Z5U)aIpB
z@w~j`xj9f!F9QXYFHlg!0tMA*1yxdw0tIy?P*5QP1yvhRP;meS6$emIaR3Ds2T)LP
i00k8XP*8CI1(k0Fb#B!DGQ$4Zlb_U0wZByB>e7F2Mabm<

literal 0
HcmV?d00001

diff --git a/testdata/drc/drcSimpleTests_au57.gds b/testdata/drc/drcSimpleTests_au57.gds
new file mode 100644
index 0000000000000000000000000000000000000000..43381ea0de30c7211805c7a53b1128dbbccb4325
GIT binary patch
literal 5450
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
EUn;=Gwg3PC

literal 0
HcmV?d00001

diff --git a/testdata/drc/drcSimpleTests_au57d.gds b/testdata/drc/drcSimpleTests_au57d.gds
new file mode 100644
index 0000000000000000000000000000000000000000..3a0e2a359711f87c849aa49930589778d475aa0f
GIT binary patch
literal 3826
zcmeHKOK(+G6kc3<PMh{>kBH&oy#s8oEeR0X#9*2jLrERnK$Hr>!hivm@=_j7oB|{H
z4J67V(TVbyC^|O&2L}R9NYI)%AV3r>-?#Q!yXUlb*D&WyzI)c*-`;z@zJ0FbQmf5K
zYgMiHo(#xqvQE~^w(@W3tL3{oJ4Dv5&fcB8@b=DMzWIA%>ekjv7Z2=}R+i@V=XvM-
zJ)Nodq^D0Lf2k&`B!9UkBD;#!A_KQXvQfO@DeeSpTo3m45s~JM2ywI!p`FNiw3BE2
zo>yeq`cqtg`*2uu?25?XIT2#>gvi7jBEx@(bWR7H#)(>3lgRar*KOUmxb7kF>W@SY
zeu4FRMP_G3h6Y7GpT{|Oik$g2jN3e22h&!HRNW)h9*@4vmSeSjXaNs=xC~#;24Cot
z`{-w%#`%idu(!i}A2)v4CtrUveexK4%$xfW`=hWUxQ!ceJjv($Y-BMvo-6Ws9ve^c
zJqMnX&Kcz9Pvit=Yhi60Px3vtj8F3u<ak5id#-If$!DcBu7{Y>-+>>3|Ew|AU>KJq
zpYyYkz^A`_SW8~xVZ6dWZ21lGNBwaAD9~%&(e1$U{uRFOM<frO7Lj~DEAiFOx#hj5
z_2Blo^!`hGZ0suXfL<ed?*WtNk8wi0vyE0qj@^5`;=lK#;$!PUNAzmB7yE)1Rru40
z7vn^9EpT-EO7YV=yT4ppw4U95zvBO#<$s?2r~NT(ez%c_?-2*bH&ItlalYHYCx(2#
z6YPzf!2gi%o8X~#+aCje3@AOYe~07)i@UJ@gmpJzpN|5L)?xo0bq8!*gMFXzeI3+w
z`#9_eN_Y(OU&Vat!dgSVqwZ)gegm!vsD8l@^RJwL_y1?rYU&kyQ=NiuV_%xieP#6n
zY<>#+rGOLb(ckwF@1cNWU&D@b5eLtkF6JV;5f}PLY{BQwN#i+x1K$6F{j(CzqYg6D
z9ju}H!}pnBr+?FoCs1|vN!Pq;UmwDL^#`aw;=ia%<RYTm9|ZpY+z~~*Blb;xIKFu2
zEz@z<tLwSyH}gUrHv5t~F7c6r1<nhoI)c)1bbFeQ`a=IwFBNfrsD3!Q{YWKVrTvk=
z%a(7T>c^EuR2>Q9<vObHRYyj`{`^MpZv{oSkEHikop>1aBHrbCr@Q@Onji0Bd`oD(
zptl_ve;ZGp-|s6$+<&Scj`(J=@iO0a>>ceRXb7LE$5%`JfHSGi-Hqq)?}u*d#d}G0
z0lm|nvwR|tvA%d;U8}^y&!hYpf9ehNocCLS{r&sE#*_Q29<y&xp+BLc{(a!z3pSqQ
z>pcYh^6!Hf-=VOcjVJkfk3tvuun%H=Q(qAe8&C4J9#MyUn19Zv|I}y3!^X>e*Ton2
z0(!^v^~JrA{+HF4=X*ccjr*Wqq<@Y7<Em2)L>3nQ`89NBWi)>sbtv^_Hd$~Mo_Z_W
zu_gQz<BE)5NOLhC-vs*T{PU>tZ8zflx}OC9Xr6z!BC^9>*Ug)yb8MHD&ee-3^~f_7
C4i)JD

literal 0
HcmV?d00001