+ copying of procedure variable defs

git-svn-id: trunk@5277 -

.gitattributes

@@ -6137,6 +6137,7 @@ tests/tbs/tb0505.pp svneol=native#text/plain
 tests/tbs/tb0506.pp svneol=native#text/plain
 tests/tbs/tb0507.pp svneol=native#text/plain
 tests/tbs/tb0508.pp svneol=native#text/plain
+tests/tbs/tb0509.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain
 tests/tbs/ub0119.pp svneol=native#text/plain

compiler/symdef.pas

@@ -3411,31 +3411,36 @@ implementation
 
 
     function tprocvardef.getcopy : tstoreddef;
-      begin
-        result:=self;
-      (*
-          { saves a definition to the return type }
-          returndef         : ttype;
-          parast          : TSymtable;
-          paras           : tparalist;
-          proctypeoption  : tproctypeoption;
-          proccalloption  : tproccalloption;
-          procoptions     : tprocoptions;
-          requiredargarea : aint;
-          { number of user visibile parameters }
-          maxparacount,
-          minparacount    : byte;
+      var
+        i : tcallercallee;
+        j : longint;
+      begin
+        result:=tprocvardef.create(parast.symtablelevel);
+        tprocvardef(result).returndef:=returndef;
+        tprocvardef(result).returndefderef:=returndefderef;
+        tprocvardef(result).parast:=parast.getcopy;
+
+        { create paralist copy }
+        tprocvardef(result).paras:=tparalist.create(false);
+        tprocvardef(result).paras.count:=paras.count;
+        for j:=0 to paras.count-1 do
+          tprocvardef(result).paras[j]:=paras[j];
+
+        tprocvardef(result).proctypeoption:=proctypeoption;
+        tprocvardef(result).proccalloption:=proccalloption;
+        tprocvardef(result).procoptions:=procoptions;
+        tprocvardef(result).requiredargarea:=requiredargarea;
+        tprocvardef(result).maxparacount:=maxparacount;
+        tprocvardef(result).minparacount:=minparacount;
+        for i:=low(tcallercallee) to high(tcallercallee) do
+          location_copy(tprocvardef(result).funcretloc[i],funcretloc[i]);
+        tprocvardef(result).has_paraloc_info:=has_paraloc_info;
 {$ifdef i386}
-          fpu_used        : longint;    { how many stack fpu must be empty }
+        tprocvardef(result).fpu_used:=fpu_used;
 {$endif i386}
-          funcretloc : array[tcallercallee] of TLocation;
-          has_paraloc_info : boolean; { paraloc info is available }
-
-       tprocvardef = class(tabstractprocdef)
-          constructor create(level:byte);
-          constructor ppuload(ppufile:tcompilerppufile);
-          function getcopy : tstoreddef;override;
-       *)
+{$ifdef m68k}
+        tprocvardef(result).exp_funcretloc:=exp_funcretlog;
+{$endif}
       end;
 
 

tests/tbs/tb0509.pp

@@ -0,0 +1,22 @@
+type
+  tp1 = function(var i : longint) : longint;
+
+  tp2 = type tp1;
+
+procedure p(f : tp1);
+  begin
+  end;
+
+
+procedure p(f : tp2);
+  begin
+  end;
+
+var
+  f : tp1;
+
+begin
+  f:=nil;
+  if assigned(f) then
+    p(f);
+end.