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

Extended RTTI: more Objective-C handling

Browse Source 
Resolves #41034
This commit is contained in:
Jonas Maebe 2025-01-05 11:49:49 +01:00
parent decb6ab3c6
commit 5c4db7dbca
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/ncgrtti.pas
View File

@ -1591,7 +1591,10 @@ implementation
{ total element count } { total element count }
tcb.emit_tai(Tai_const.Create_sizeint(asizeint(totalcount)),sizeuinttype); tcb.emit_tai(Tai_const.Create_sizeint(asizeint(totalcount)),sizeuinttype);
{ last dimension element type } { last dimension element type }
tcb.emit_tai(Tai_const.Create_sym(get_rtti_label(curdef.elementdef,rt,true)),voidpointertype); if is_objc_class_or_protocol(curdef.elementdef) then
tcb.emit_tai(Tai_const.Create_sym(get_rtti_label(voidpointertype,rt,true)),voidpointertype)
else
tcb.emit_tai(Tai_const.Create_sym(get_rtti_label(curdef.elementdef,rt,true)),voidpointertype);
{ dimension count } { dimension count }
tcb.emit_ord_const(dimcount,u8inttype); tcb.emit_ord_const(dimcount,u8inttype);
finaldef:=def; finaldef:=def;
@ -2635,6 +2638,10 @@ implementation
rttidef: tdef; rttidef: tdef;
s: TIDString; s: TIDString;
begin begin
{ Objective-C has its own RTTI system }
if is_objc_class_or_protocol(def) then
exit;
{ only write rtti of definitions from the current module } { only write rtti of definitions from the current module }
if not findunitsymtable(def.owner).iscurrentunit then if not findunitsymtable(def.owner).iscurrentunit then
exit; exit;