From 3d22aa3cd1725775ccfc66e50a76e49a21ea375d Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 28 Aug 2011 19:22:00 +0000
Subject: [PATCH]   + support for synthetic procdefs that are not part of a
 structdef     (previously, they would not get an implementation)

git-svn-id: branches/jvmbackend@18878 -
---
 compiler/symcreat.pas | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/compiler/symcreat.pas b/compiler/symcreat.pas
index 6e9c1037b0..9f96e146af 100644
--- a/compiler/symcreat.pas
+++ b/compiler/symcreat.pas
@@ -806,17 +806,20 @@ implementation
     end;
 
 
-  procedure add_synthetic_method_implementations_for_struct(struct: tabstractrecorddef);
+  procedure add_synthetic_method_implementations_for_st(st: tsymtable);
     var
       i   : longint;
       def : tdef;
       pd  : tprocdef;
     begin
-      for i:=0 to struct.symtable.deflist.count-1 do
+      for i:=0 to st.deflist.count-1 do
         begin
-          def:=tdef(struct.symtable.deflist[i]);
+          def:=tdef(st.deflist[i]);
           if (def.typ<>procdef) then
             continue;
+          { skip methods when processing unit symtable }
+          if def.owner<>st then
+            continue;
           pd:=tprocdef(def);
           case pd.synthetickind of
             tsk_none:
@@ -879,7 +882,8 @@ implementation
       { only necessary for the JVM target currently }
       if not (target_info.system in [system_jvm_java32]) then
         exit;
-      sstate.valid:=false;
+      replace_scanner('synthetic_impl',sstate);
+      add_synthetic_method_implementations_for_st(st);
       for i:=0 to st.deflist.count-1 do
         begin
           def:=tdef(st.deflist[i]);
@@ -892,9 +896,6 @@ implementation
               not(oo_is_external in tobjectdef(def).objectoptions)) or
               (def.typ=recorddef) then
            begin
-             if not sstate.valid then
-               replace_scanner('synthetic_impl',sstate);
-            add_synthetic_method_implementations_for_struct(tabstractrecorddef(def));
             { also complete nested types }
             add_synthetic_method_implementations(tabstractrecorddef(def).symtable);
            end;