From e90cf131feb4a893b8825c3f4545407a1921d23f Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Mon, 12 Oct 2020 16:55:14 +0000
Subject: [PATCH] * fix for Mantis #37844: prefer to use the symtable
 determined in generate_specialization_phase1 for procdefs as that might a
 withsymtable that is needed to correctly load Self later on + added test

git-svn-id: trunk@47101 -
---
 .gitattributes          |  1 +
 compiler/pexpr.pas      |  5 ++++-
 tests/webtbs/tw37844.pp | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tests/webtbs/tw37844.pp

diff --git a/.gitattributes b/.gitattributes
index f5f6d5bede..777874fb21 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18488,6 +18488,7 @@ tests/webtbs/tw3780.pp svneol=native#text/plain
 tests/webtbs/tw37806.pp svneol=native#text/pascal
 tests/webtbs/tw3782.pp svneol=native#text/plain
 tests/webtbs/tw37823.pp svneol=native#text/pascal
+tests/webtbs/tw37844.pp svneol=native#text/pascal
 tests/webtbs/tw3796.pp svneol=native#text/plain
 tests/webtbs/tw3805.pp svneol=native#text/plain
 tests/webtbs/tw3814.pp svneol=native#text/plain
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index 1a16d0e4ad..e18a76e5d2 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -3032,7 +3032,10 @@ implementation
                                  else
                                    begin
                                      srsym:=tprocdef(hdef).procsym;
-                                     srsymtable:=srsym.owner;
+                                     if assigned(spezcontext.symtable) then
+                                       srsymtable:=spezcontext.symtable
+                                     else
+                                       srsymtable:=srsym.owner;
                                    end;
                                end
                              else
diff --git a/tests/webtbs/tw37844.pp b/tests/webtbs/tw37844.pp
new file mode 100644
index 0000000000..c016dd6035
--- /dev/null
+++ b/tests/webtbs/tw37844.pp
@@ -0,0 +1,40 @@
+program tw37844;
+{$mode objfpc}
+
+type
+    trec = record
+      value: longint;
+    end;
+    {generic grec<T> = record
+        value: T;
+    end;}
+
+    tmytype = class
+    public
+    generic function func1<T>( const v: longint ): trec;//specialize grec<T>;
+    end;
+
+generic function tmytype.func1<T>( const v: longint ): trec;//specialize grec<T>;
+begin
+    result.value := v;
+    //result.value := t(v);
+end;
+
+var
+    tmp: tmytype;
+    gr: trec;//specialize grec<string>;
+    vr: longint;//variant;
+
+begin
+    tmp := tmytype.Create;
+    vr := 123;
+    gr := Default(trec);
+    with tmp do
+        gr := specialize func1<string>( vr ); // <--!!!!!!!!!!!!!!!!!!!
+    //gr := tmp.specialize func1<string>(vr);
+    //writeln(gr.value);
+    tmp.Free;
+    if gr.value<>vr then
+      halt(1);
+    //readln;
+end.