From 3ce6cae11d0f754038ac31a3249431903a7909c3 Mon Sep 17 00:00:00 2001
From: Sven Barth <pascaldragon@gmail.com>
Date: Sat, 28 Aug 2021 17:58:34 +0200
Subject: [PATCH] * fix for #39310 by fixing various small issues in
 tabstractrecordsymtable.has_single_field:   - initialize the returned def to
 a safe default   - correctly reset the found symbol for each loop   - reset
 the result when descending into a record + added test

---
 compiler/symtable.pas   | 10 ++++++++--
 tests/webtbs/tw39310.pp | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 tests/webtbs/tw39310.pp

diff --git a/compiler/symtable.pas b/compiler/symtable.pas
index 8117af72f7..140412c765 100644
--- a/compiler/symtable.pas
+++ b/compiler/symtable.pas
@@ -1633,6 +1633,7 @@ implementation
         sym: tfieldvarsym;
       begin
         result:=false;
+        def:=generrordef;
         { If a record contains a union, it does not contain a "single
           non-composite field" in the context of certain ABIs requiring
           special treatment for such records }
@@ -1642,8 +1643,8 @@ implementation
         { a record/object can contain other things than fields }
         currentsymlist:=symlist;
         { recurse in arrays and records }
-        sym:=nil;
         repeat
+          sym:=nil;
           { record has one field? }
           for i:=0 to currentsymlist.Count-1 do
             begin
@@ -1674,7 +1675,12 @@ implementation
                 end;
               { if the array element is again a record, continue descending }
               if currentdef.typ=recorddef then
-                currentsymlist:=trecorddef(currentdef).symtable.SymList
+                begin
+                  { the record might be empty, so reset the result until we've
+                    really found something }
+                  result:=false;
+                  currentsymlist:=trecorddef(currentdef).symtable.SymList
+                end
               else
                 begin
                   { otherwise we found the type of the single element }
diff --git a/tests/webtbs/tw39310.pp b/tests/webtbs/tw39310.pp
new file mode 100644
index 0000000000..eec8ea1d1a
--- /dev/null
+++ b/tests/webtbs/tw39310.pp
@@ -0,0 +1,21 @@
+{ %NORUN }
+
+{$MODESWITCH ADVANCEDRECORDS}
+Program tw39310;
+
+Type
+  Rec0 = record
+  end;
+
+  Rec1 = record
+    r:Rec0;
+    Procedure Proc;
+  end;
+
+Procedure Rec1.Proc;
+  begin
+  end;
+
+Begin
+End.
+