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

Fix -CR after the recent VMT changes.

Browse Source 
* tobjectvmt: parent needs to be ppointer for 3.1.1
* fpc_check_object_ext: correctly determine parent VMT

git-svn-id: trunk@34194 -
This commit is contained in:
svenbarth 2016-07-23 16:42:15 +00:00
parent 131a7bbc67
commit 59303c5113
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/inc/generic.inc
View File

@ -747,7 +747,7 @@ type
pobjectvmt=^tobjectvmt; pobjectvmt=^tobjectvmt;
tobjectvmt=record tobjectvmt=record
size,msize:sizeuint; size,msize:sizeuint;
parent:pointer; parent:{$ifdef VER3_0}pointer{$else}ppointer{$endif};
end; end;
{$ifndef FPC_SYSTEM_HAS_FPC_HELP_CONSTRUCTOR} {$ifndef FPC_SYSTEM_HAS_FPC_HELP_CONSTRUCTOR}
@ -852,7 +852,14 @@ begin
if vmt=expvmt then if vmt=expvmt then
exit exit
else else
{$ifdef VER3_0}
vmt:=pobjectvmt(vmt)^.parent; vmt:=pobjectvmt(vmt)^.parent;
{$else VER3_0}
if assigned(pobjectvmt(vmt)^.parent) then
vmt:=pobjectvmt(vmt)^.parent^
else
exit;
{$endif}
RunError(219); RunError(219);
end; end;
{$endif not FPC_SYSTEM_HAS_FPC_CHECK_OBJECT_EXT} {$endif not FPC_SYSTEM_HAS_FPC_CHECK_OBJECT_EXT}