paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 00:08:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* replaced custom packed record with tmethod

Browse Source 
git-svn-id: trunk@45465 -
This commit is contained in:
Jonas Maebe 2020-05-22 13:11:52 +00:00
parent d05997db74
commit 5be84e8079
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compiler/ncnv.pas
View File

@ -2393,17 +2393,14 @@ implementation
type
tprocedureofobject = function : tnode of object;
var
r : packed record
proc : pointer;
obj : pointer;
end;
r : TMethod;
begin
result:=nil;
{ this is a little bit dirty but it works }
{ and should be quite portable too }
r.proc:=resultdefconvert[c];
r.obj:=self;
if assigned(r.proc) then
r.Code:=resultdefconvert[c];
r.Data:=self;
if assigned(r.Code) then
result:=tprocedureofobject(r)();
end;
@ -3981,16 +3978,13 @@ implementation
type
tprocedureofobject = function : tnode of object;
var
r : packed record
proc : pointer;
obj : pointer;
end;
r : TMethod;
begin
{ this is a little bit dirty but it works }
{ and should be quite portable too }
r.proc:=firstconvert[c];
r.obj:=self;
if not assigned(r.proc) then
r.Code:=firstconvert[c];
r.Data:=self;
if not assigned(r.Code) then
internalerror(200312081);
first_call_helper:=tprocedureofobject(r)()
end;
@ -4262,16 +4256,13 @@ implementation
tprocedureofobject = procedure of object;
var
r : packed record
proc : pointer;
obj : pointer;
end;
r : TMethod;
begin
{ this is a little bit dirty but it works }
{ and should be quite portable too }
r.proc:=secondconvert[c];
r.obj:=self;
r.Code:=secondconvert[c];
r.Data:=self;
tprocedureofobject(r)();
end;