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

Try to fix alignment issues in RTTI code for 64-bit targets which require proper alignment

Browse Source 
git-svn-id: trunk@42549 -
This commit is contained in:
pierre 2019-08-01 14:46:56 +00:00
parent 62218e823f
commit d6d3e171ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/rtti.inc
View File

@ -128,7 +128,7 @@ begin
{$endif VER3_0}
Count:=PRecordInfoInit(typeInfo)^.Count;
{ Get element info, hacky, but what else can we do? }
typeInfo:=Pointer(@PRecordInfoInit(typeInfo)^.Count)+SizeOf(PRecordInfoInit(typeInfo)^.Count);
typeInfo:=aligntoptr(Pointer(@PRecordInfoInit(typeInfo)^.Count)+SizeOf(PRecordInfoInit(typeInfo)^.Count));
{ Process elements }
for i:=1 to count Do
begin
@ -404,7 +404,7 @@ begin
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);
Temp:=aligntoptr(Pointer(@PRecordInfoInit(Temp)^.Count)+SizeOf(PRecordInfoInit(Temp)^.Count));
{$else VER3_0}
Result:=PRecordInfoFull(Temp)^.Size;
EleCount:=PRecordInfoFull(Temp)^.Count;