From 5adf7d30a54fb9d27b27aa248abdb747c284a74b Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 6 Oct 2002 15:08:59 +0000
Subject: [PATCH]   * only check for forwarddefs the definitions that really
 belong to     the current procsym

---
 compiler/defbase.pas | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/compiler/defbase.pas b/compiler/defbase.pas
index 165a926912..1c0b59944a 100644
--- a/compiler/defbase.pas
+++ b/compiler/defbase.pas
@@ -1924,17 +1924,29 @@ implementation
                     b:=2;
                 end;
              end;
-          formaldef:
-            {Just about everything can be converted to a formaldef...}
-            if not (def_from.deftype in [abstractdef,errordef]) then
-               b:=1;
-            else
+
+           variantdef :
+             begin
+               if (fromtreetype=niln) then
                 begin
-                  { assignment overwritten ?? }
-                  if internal_assignment_overloaded(def_from,def_to,overload_procs)<>nil then
-                    b:=2;
+                  doconv:=tc_equal;
+                  b:=1;
                 end;
-         end;
+             end;
+
+           formaldef :
+             begin
+               { Just about everything can be converted to a formaldef...}
+               if not (def_from.deftype in [abstractdef,errordef]) then
+                 b:=1
+               else
+                 begin
+                   { assignment overwritten ?? }
+                   if internal_assignment_overloaded(def_from,def_to,overload_procs)<>nil then
+                     b:=2;
+                 end;
+             end;
+        end;
         overloaded_assignment_isconvertable :=b;
       end;
 
@@ -1969,7 +1981,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.17  2002-10-06 12:25:04  florian
+  Revision 1.18  2002-10-06 15:08:59  peter
+    * only check for forwarddefs the definitions that really belong to
+      the current procsym
+
+  Revision 1.17  2002/10/06 12:25:04  florian
     + proper support of type <id> = type <another id>;
 
   Revision 1.16  2002/10/05 12:43:24  carl