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

* handle records with managed fields correctly after attribute merge fixes

Browse Source 
git-svn-id: trunk@42480 -
This commit is contained in:
florian 2019-07-21 14:17:27 +00:00
parent aac8559a8d
commit a60ab40237
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/inc/rtti.inc
View File

@ -401,11 +401,16 @@ begin
recordop^.Copy(Src,Dest) recordop^.Copy(Src,Dest)
else else
begin begin
{$endif VER3_0} Result:=PRecordInfoInit(Temp)^.Size;
EleCount:=PRecordInfoInit(Temp)^.Count;
{ Get element info, hacky, but what else can we do? }
Temp:=Pointer(@PRecordInfoInit(Temp)^.Count)+SizeOf(PRecordInfoInit(Temp)^.Count);
{$else VER3_0}
Result:=PRecordInfoFull(Temp)^.Size; Result:=PRecordInfoFull(Temp)^.Size;
EleCount:=PRecordInfoFull(Temp)^.Count; EleCount:=PRecordInfoFull(Temp)^.Count;
{ Get element info, hacky, but what else can we do? } { Get element info, hacky, but what else can we do? }
Temp:=Pointer(@PRecordInfoFull(Temp)^.Count)+SizeOf(PRecordInfoFull(Temp)^.Count); Temp:=Pointer(@PRecordInfoFull(Temp)^.Count)+SizeOf(PRecordInfoFull(Temp)^.Count);
{$endif VER3_0}
expectedoffset:=0; expectedoffset:=0;
{ Process elements with rtti } { Process elements with rtti }
for i:=1 to EleCount Do for i:=1 to EleCount Do