paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-15 17:19:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* do not inline functions/procedures called with things like "nil^"

Browse Source 
(that can be passed to a const-by-reference or var parameter,
     but leads to errors when inlining)

git-svn-id: trunk@9281 -
This commit is contained in:
Jonas Maebe 2007-11-18 14:29:19 +00:00
parent 05e44101e8
commit 543faa46ad
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/ncal.pas
View File

@ -178,7 +178,7 @@ interface
procedure printnodetree(var t:text);override;
{ returns whether a parameter contains a type conversion from }
{ a refcounted into a non-refcounted type }
function contains_unsafe_typeconversion: boolean;
function can_be_inlined: boolean;
property nextpara : tnode read right write right;
property parametername : tnode read third write third;
@ -834,11 +834,12 @@ implementation
end;
function tcallparanode.contains_unsafe_typeconversion: boolean;
function tcallparanode.can_be_inlined: boolean;
var
n: tnode;
begin
n:=left;
result:=false;
while assigned(n) and
(n.nodetype=typeconvn) do
begin
@ -848,13 +849,21 @@ implementation
is_class(n.resultdef)) and
(ttypeconvnode(n).left.resultdef.needs_inittable and
not is_class(ttypeconvnode(n).left.resultdef)) then
begin
result:=true;
exit;
end;
exit;
n:=ttypeconvnode(n).left;
end;
result:=false;
{ also check for dereferencing constant pointers, like }
{ tsomerecord(nil^) passed to a const r: tsomerecord }
{ parameter }
if (n.nodetype=derefn) then
begin
repeat
n:=tunarynode(n).left;
until (n.nodetype<>typeconvn);
if (n.nodetype in [niln,pointerconstn]) then
exit
end;
result:=true;
end;
@ -2598,9 +2607,9 @@ implementation
para:=tcallparanode(parameters);
while assigned(para) do
begin
if para.contains_unsafe_typeconversion then
if not para.can_be_inlined then
begin
Comment(V_lineinfo+V_Debug,'Not inlining "'+tprocdef(procdefinition).procsym.realname+'", invocation parameter contains unsafe type conversion');
Comment(V_lineinfo+V_Debug,'Not inlining "'+tprocdef(procdefinition).procsym.realname+'", invocation parameter contains an unsafe/unsupported construct');
exclude(callnodeflags,cnf_do_inline);
break;
end;