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

* fixed writing the VMT field of TP-style objects for typed constants if it

Browse Source 
comes after the last defined field (previously, we emitted a bunch of
    superfluous zero-bytes after that field due to bad accounting regarding
    the last emitted field)
   o fixes webtbs/tw1365.pp for LLVM, and removes junk bytes for all targets

git-svn-id: trunk@35019 -
This commit is contained in:
Jonas Maebe 2016-11-29 21:54:27 +00:00
parent 8cd84bd8e8
commit 7af2663ed1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/ngtcon.pas
View File

@ -1783,16 +1783,15 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
end;
end;
curoffset:=startoffset;
{ add VMT pointer if we stopped writing fields before the VMT was
written }
if not(m_fpc in current_settings.modeswitches) and
(oo_has_vmt in def.objectoptions) and
(def.vmt_offset>=objoffset) then
begin
for i:=1 to def.vmt_offset-objoffset do
ftcb.emit_tai(tai_const.create_8bit(0),u8inttype);
// TODO VMT type proper tdef?
ftcb.emit_tai(tai_const.createname(def.vmt_mangledname,AT_DATA,0),voidpointertype);
{ this is more general }
objoffset:=def.vmt_offset + sizeof(pint);
ftcb.next_field:=tfieldvarsym(def.vmt_field);
ftcb.emit_tai(tai_const.createname(def.vmt_mangledname,AT_DATA,0),tfieldvarsym(def.vmt_field).vardef);
objoffset:=def.vmt_offset+tfieldvarsym(def.vmt_field).vardef.size;
end;
ftcb.maybe_end_aggregate(def);
consume(_RKLAMMER);