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

* specify the unit from which the routine comes when handling tsk_callthrough

Browse Source 
in case the called routine in a global procedure/function (to avoid
    potential symbol hiding issues)

git-svn-id: trunk@34126 -
This commit is contained in:
Jonas Maebe 2016-07-14 15:23:39 +00:00
parent 0311528502
commit c1fd3bc0de
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/symcreat.pas
View File

@ -282,6 +282,19 @@ implementation
end;
function def_unit_name_prefix_if_toplevel(def: tdef): TSymStr;
begin
result:='';
{ if the routine is a global routine in a unit, explicitly use this unit
name to avoid accidentally calling other same-named routines that may be
in scope }
if not assigned(def.owner.defowner) and
assigned(def.owner.realname) and
(def.owner.moduleid<>0) then
result:=def.owner.realname^+'.';
end;
procedure add_missing_parent_constructors_intf(obj: tobjectdef; addvirtclassmeth: boolean; forcevis: tvisibility);
var
parent: tobjectdef;
@ -519,7 +532,10 @@ implementation
str:='begin ';
if pd.returndef<>voidtype then
str:=str+'result:=';
str:=str+callpd.procsym.realname+'(';
{ if the routine is a global routine in a unit/program, explicitly
mnetion this program/unit name to avoid accidentally calling other
same-named routines that may be in scope }
str:=str+def_unit_name_prefix_if_toplevel(callpd)+callpd.procsym.realname+'(';
addvisibibleparameters(str,pd);
str:=str+') end;';
str_parse_method_impl(str,pd,isclassmethod);