paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-03 04:07:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

compiler: write not dummy unit name for enumeration and dynamic array rtti

Browse Source 
git-svn-id: trunk@14511 -
This commit is contained in:
paul 2010-01-01 19:32:53 +00:00
parent dd94f5cf2b
commit db0f23e643
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/ncgrtti.pas
View File

@ -436,10 +436,12 @@ implementation
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_32bit(def.max));
if (tf_requires_proper_alignment in target_info.flags) then
current_asmdata.asmlists[al_rtti].concat(Cai_align.Create(sizeof(TConstPtrUint)));
{ write base type }
if assigned(def.basedef) then
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_sym(ref_rtti(def.basedef,rt)))
else
current_asmdata.asmlists[al_rtti].concat(Tai_const.create_sym(nil));
{ write name list }
hp:=tenumsym(def.firstenum);
while assigned(hp) do
begin
@ -447,7 +449,9 @@ implementation
current_asmdata.asmlists[al_rtti].concat(Tai_string.Create(hp.realname));
hp:=hp.nextenum;
end;
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_8bit(0));
{ write unit name }
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_8bit(length(current_module.realmodulename^)));
current_asmdata.asmlists[al_rtti].concat(Tai_string.Create(current_module.realmodulename^));
end;
procedure orddef_rtti(def:torddef);
@ -603,8 +607,9 @@ implementation
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_sym(ref_rtti(def.elementdef,rt)))
else
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_pint(0));
{ dummy DynUnitName }
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_8bit(0));
{ write unit name }
current_asmdata.asmlists[al_rtti].concat(Tai_const.Create_8bit(length(current_module.realmodulename^)));
current_asmdata.asmlists[al_rtti].concat(Tai_string.Create(current_module.realmodulename^));
end;
end;

3
rtl/objpas/typinfo.pp
View File

@ -107,7 +107,8 @@ unit typinfo;
tkEnumeration:
(
BaseType : PTypeInfo;
NameList : ShortString)
NameList : ShortString;
{EnumUnitName: ShortString;})
);
tkSet:
(CompType : PTypeInfo)