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

* fixed copying of automated records

Browse Source 
git-svn-id: trunk@7696 -
This commit is contained in:
florian 2007-06-16 21:44:55 +00:00
parent 84da64db85
commit 2c4aeefbf4
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/compproc.inc
View File

@ -410,7 +410,7 @@ Procedure fpc_finalize (Data,TypeInfo: Pointer); compilerproc;
Procedure fpc_Addref (Data,TypeInfo : Pointer); compilerproc;
Procedure fpc_DecRef (Data,TypeInfo : Pointer); compilerproc;
procedure fpc_finalize_array(data,typeinfo : pointer;count,size : longint); compilerproc;
procedure fpc_Copy (Src, Dest, TypeInfo : Pointer); compilerproc;
Function fpc_Copy (Src, Dest, TypeInfo : Pointer) : SizeInt; compilerproc;
{$endif FPC_HAS_FEATURE_RTTI}

23
rtl/inc/rtti.inc
View File

@ -223,18 +223,21 @@ begin
end;
{ define alias for internal use in the system unit }
Procedure fpc_Copy_internal (Src, Dest, TypeInfo : Pointer);[external name 'FPC_COPY'];
Function fpc_Copy_internal (Src, Dest, TypeInfo : Pointer) : SizeInt;[external name 'FPC_COPY'];
Procedure fpc_Copy (Src, Dest, TypeInfo : Pointer);[Public,alias : 'FPC_COPY']; compilerproc;
Function fpc_Copy (Src, Dest, TypeInfo : Pointer) : SizeInt;[Public,alias : 'FPC_COPY']; compilerproc;
var
Temp : pbyte;
namelen : byte;
copiedsize,
expectedoffset,
count,
offset,
size,
i : SizeInt;
info : pointer;
begin
result:=sizeof(pointer);
case PByte(TypeInfo)^ of
tkAstring:
begin
@ -263,6 +266,7 @@ begin
{ Process elements }
for I:=0 to Count-1 do
fpc_Copy_internal(Src+(I*size),Dest+(I*size),Info);
Result:=size*count;
end;
tkobject,
tkrecord:
@ -275,22 +279,26 @@ begin
temp:=aligntoptr(temp);
{ copy data }
move(src^,dest^,plongint(temp)^);
Result:=plongint(temp)^;
{ Skip size }
inc(Temp,4);
{ Element count }
Count:=PLongint(Temp)^;
inc(Temp,sizeof(Count));
expectedoffset:=0;
{ Process elements with rtti }
for i:=1 to count Do
begin
Info:=PPointer(Temp)^;
inc(Temp,sizeof(Info));
Offset:=PLongint(Temp)^;
if Offset>expectedoffset then
move((Src+expectedoffset)^,(Dest+expectedoffset)^,Offset-expectedoffset);
inc(Temp,sizeof(Offset));
fpc_Copy_internal(Src+Offset,Dest+Offset,Info);
end;
copiedsize:=fpc_Copy_internal(Src+Offset,Dest+Offset,Info);
expectedoffset:=Offset+copiedsize;
end;
end;
tkDynArray:
begin
@ -305,7 +313,10 @@ begin
PPointer(Dest)^:=PPointer(Src)^;
end;
tkVariant:
VarCopyProc(pvardata(dest)^,pvardata(src)^);
begin
VarCopyProc(pvardata(dest)^,pvardata(src)^);
result:=sizeof(tvardata);
end;
end;
end;