paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-28 16:20:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* reference the RTTI assembler symbols if they're queried from a different unit than the own they're declared in

Browse Source 
git-svn-id: trunk@34347 -
This commit is contained in:
svenbarth 2016-08-19 14:54:28 +00:00
parent c2ba68df44
commit f50671fe44
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/ncgrtti.pas
View File

@ -1591,27 +1591,42 @@ implementation
function TRTTIWriter.get_rtti_label(def:tdef;rt:trttitype;indirect:boolean):tasmsymbol; function TRTTIWriter.get_rtti_label(def:tdef;rt:trttitype;indirect:boolean):tasmsymbol;
var
name : tsymstr;
begin begin
result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt),AT_DATA,indirect); name:=def.rtti_mangledname(rt);
result:=current_asmdata.RefAsmSymbol(name,AT_DATA,indirect);
if (cs_create_pic in current_settings.moduleswitches) and if (cs_create_pic in current_settings.moduleswitches) and
assigned(current_procinfo) then assigned(current_procinfo) then
include(current_procinfo.flags,pi_needs_got); include(current_procinfo.flags,pi_needs_got);
if assigned(current_module) and (findunitsymtable(def.owner).moduleid<>current_module.moduleid) then
current_module.add_extern_asmsym(name,AB_EXTERNAL,AT_DATA);
end; end;
function TRTTIWriter.get_rtti_label_ord2str(def:tdef;rt:trttitype;indirect:boolean):tasmsymbol; function TRTTIWriter.get_rtti_label_ord2str(def:tdef;rt:trttitype;indirect:boolean):tasmsymbol;
var
name : tsymstr;
begin begin
result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_o2s',AT_DATA,indirect); name:=def.rtti_mangledname(rt)+'_o2s';
result:=current_asmdata.RefAsmSymbol(name,AT_DATA,indirect);
if (cs_create_pic in current_settings.moduleswitches) and if (cs_create_pic in current_settings.moduleswitches) and
assigned(current_procinfo) then assigned(current_procinfo) then
include(current_procinfo.flags,pi_needs_got); include(current_procinfo.flags,pi_needs_got);
if assigned(current_module) and (findunitsymtable(def.owner).moduleid<>current_module.moduleid) then
current_module.add_extern_asmsym(name,AB_EXTERNAL,AT_DATA);
end; end;
function TRTTIWriter.get_rtti_label_str2ord(def:tdef;rt:trttitype;indirect:boolean):tasmsymbol; function TRTTIWriter.get_rtti_label_str2ord(def:tdef;rt:trttitype;indirect:boolean):tasmsymbol;
var
name : tsymstr;
begin begin
result:=current_asmdata.RefAsmSymbol(def.rtti_mangledname(rt)+'_s2o',AT_DATA,indirect); name:=def.rtti_mangledname(rt)+'_s2o';
result:=current_asmdata.RefAsmSymbol(name,AT_DATA,indirect);
if (cs_create_pic in current_settings.moduleswitches) and if (cs_create_pic in current_settings.moduleswitches) and
assigned(current_procinfo) then assigned(current_procinfo) then
include(current_procinfo.flags,pi_needs_got); include(current_procinfo.flags,pi_needs_got);
if assigned(current_module) and (findunitsymtable(def.owner).moduleid<>current_module.moduleid) then
current_module.add_extern_asmsym(name,AB_EXTERNAL,AT_DATA);
end; end;
end. end.