From 3823906c2dff1ad4f453173d094e48ce14fc6f2e Mon Sep 17 00:00:00 2001
From: Ivan Bondarev <ibond84@googlemail.com>
Date: Thu, 4 Jan 2024 17:44:29 +0100
Subject: [PATCH] fix #2815

---
 TestSuite/abstract6.pas                   |  18 ++++++++++++++++++
 TestSuite/l1.dll                          | Bin 0 -> 4096 bytes
 TreeConverter/TreeRealization/generics.cs |   7 +++++++
 3 files changed, 25 insertions(+)
 create mode 100644 TestSuite/abstract6.pas
 create mode 100644 TestSuite/l1.dll

diff --git a/TestSuite/abstract6.pas b/TestSuite/abstract6.pas
new file mode 100644
index 000000000..edf809710
--- /dev/null
+++ b/TestSuite/abstract6.pas
@@ -0,0 +1,18 @@
+{$reference l1.dll}
+
+type
+  c0 = class end;
+  
+  // обязательно использовать кастомный тип в качестве типоаргумента
+  // с ns.c2<object> не проявляется
+  c3 = class(ns.c2<c0>)
+  procedure test;
+  begin
+    f1();
+  end;
+  end;
+
+begin
+  var obj := new c3;
+  
+end.
\ No newline at end of file
diff --git a/TestSuite/l1.dll b/TestSuite/l1.dll
new file mode 100644
index 0000000000000000000000000000000000000000..a81af485c05230be67308e4082ccd060a6701165
GIT binary patch
literal 4096
zcmd^BTWl0n82)E_p%hp_2!axvQmTMtvfEZl1?#pu1#0NU?ov=Up|iWE+o7{F>zUcY
zl4$BR(!_)(9(>WnM@jU-2q7^sk?>%`qb9ud(FYTrF-H9UGrQaEMM!)j{O$SXznt^m
z&e=IL`p#8qBBExDhYyKv;>nay_-I&wIr`$QDE+YUZpTgS^xcm1tnKS1=@q0^)N_{W
zdV!u5x-7f8?ds-uN-uhOVQksbzQ5{vVwmW()<l&%*F-Ja5=A;TX`6`JplJ=YV=v>W
zV<a$$wkkdn=FJMuU(o^(dZs2ye9BY#fB9JzSq1w0C8BX=5(vkQSWVMJo1weiMYLzN
z?NPEGreB-V2KiJ?z|#oCr2x<L27r#iwN~>6r${H7Hl#0ekW_97FkEOmMgt{~y&;9;
zVIt>B(-`b4iqSv`qM-&+u`%u|h;xfj3*~hzZz0lH`9ElH<iImX@K8G)0*fSC57AKS
z%^|Jok@K7HHDX3jtS8>j0b0lbE+Js&2RI8@avY;G6-e7H_&not)XeSaJd>iU;CVYc
zPo5bu@%$R{&nyo)UKUR#EZ0u%Ale8U{ngb&JHvW-9d9wKk)-Ms*I66f*s$(aI!s+S
zdgo{W_%Xc){8Hf!g}*Djudq#HYp22ih4b23t(6uP|D*Pe)<?g>Z7V&{?m@pha!&;b
zBXM6oL`B<Z2Rc!co`ci|iL+(8)AFjyZ9-@1lU+xZbWTZkD73x1!nTc$V*7V1>`-`6
zVO(Lq!a;>23g1%rHgG#xinoEgr~=%J3_0RPg$8Y+PBJiW4)_B3z)pp)DC|-CV_0cW
zQfX2ObMyr?b94>p(^u5I5O#iW-))Z+^<m?9Z)&79{Nh@vCsZFF_3~v$43HBy@{U8f
zIJrLMx~Jn*^mCqc>@1}!ejti8p1mM)0i|gsPDU>9WYu6ymfgTE3S&x0-}YRbGfG>s
zAc7NkZ;6YZoEr>q{Icah)R%}E2hK2?27O-?vrZ*#2aZ^tSW}zA&q=$)Q`Z`ko;za~
z%F_BTbFpN(m9^_8B&yB@YYj=SRFQUJb{$h%T6s~l8jGprm@GR%SvDjecC6l*5jPOh
zE2V^-w{ya$q*t7>eLK5ez11czr&jf4+E&5!{J_rnWQuILP_S044|V80HWVRNWq^n!
z+Yz!c1t?VCCWT{NQk=gWwYsOg4yLT_*g-=doj9MKCS9GO-!5Of_0faH(JSo-3em-9
z18Tc*IWx7pcj*cyXwAB&MHwP3fNlNEww=`Id1GuiT|Xd)t7X5=FEfqO(H(V@Y5OI|
zs*K?%ZRIt3-J<ty&?v&Ww5VVIc8#L-4b;11-Mx6xX@p52F#OUZ+RJZ+bY$mQX_dx2
zclc6HsMD36mEJ`^e2vuaPyB>v4|Geoua<DPOs33K`Olk+-_o(f!ol}H%X~Nc3opsN
zmO10&_-E{_=jJoxt}vxNFEXY#S1t-{e<n3+$&xANaj%qgoIn08`57n9|6cY&M(rO2
zqm<8bnol0>uikx}`2h1eb8D$~M~0U3Nl%)NGiupx_{I@Jy@=TQunRua*Tz~ePl85M
z$?qasSeb2jd&kz%^F01`IF}&0&WEo`*CRN~G({;o4;-dRa3lEA8iPCnJQ03%(NE3y
z|Eb-;x4prA%=7b&svo`&8r&+a3Dn@#A_+e>z8?g9x->)KMY3PrB57DHXnoi%3NX)u
z6w>$2o8eSLP61}w&==P6^ap+@8pY~=y_5w{7){XEBAbYg3rP7Xt%&20dh1XEUmMHw
zr!Ze)#d1Elo#4~J?b=62s2^N6_#;@|t<sIr2CU}_1GUygJq~(kQ4unMXAgNi`Adq(
zRPj#3R!}pOsJw*xm@6&NEW8kI=G8hK(P9|9Z-n?9bG*8SJH#<-HM6vS>;tMd6IkaV
zqcZvuG-Mj)%KpO~SI%4AnaB0zl&W(Oz4TFQ5xe7{N*yO-WrrW<hx2)ANe{n+C;Fb+
J4m{O`{|i+n3=jYS

literal 0
HcmV?d00001

diff --git a/TreeConverter/TreeRealization/generics.cs b/TreeConverter/TreeRealization/generics.cs
index 96e044663..72923fb04 100644
--- a/TreeConverter/TreeRealization/generics.cs
+++ b/TreeConverter/TreeRealization/generics.cs
@@ -1824,6 +1824,13 @@ namespace PascalABCCompiler.TreeRealization
                 cmn.return_variable = (orig_fn as common_function_node)?.return_variable;
             }
             cmn.IsOperator = orig_fn.IsOperator;
+            if (orig_fn is compiled_function_node)
+            {
+                compiled_function_node fn_orig = orig_fn as compiled_function_node;
+                if (fn_orig.method_info.GetBaseDefinition() != null)
+                    cmn.overrided_method = compiled_function_node.get_compiled_method(fn_orig.method_info.GetBaseDefinition());
+            }
+            
             return cmn;
         }