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

* also in case of constref make_not_regable with ra_addr_taken must be called, later on in pass_1 this happens anyways

Browse Source 
* for in loops can generate temp. refs as loop counter, so when checking of the address of the for counter is taken, we have to check for a load node

git-svn-id: trunk@38692 -
This commit is contained in:
florian 2018-04-05 20:09:40 +00:00
parent e1d0e7572e
commit bd27b7635b
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/ncal.pas
View File

@ -1378,15 +1378,12 @@ implementation
vs_constref: vs_constref:
begin begin
set_varstate(left,vs_readwritten,[vsf_must_be_valid,vsf_use_hints]); set_varstate(left,vs_readwritten,[vsf_must_be_valid,vsf_use_hints]);
{ constref takes also the address, but storing it is actually the compiler { compilerprocs never capture the address of their
is not supposed to expect } parameters }
if parasym.varspez=vs_var then if not(po_compilerproc in aktcallnode.procdefinition.procoptions) then
{ compilerprocs never capture the address of their make_not_regable(left,[ra_addr_regable,ra_addr_taken])
parameters } else
if not(po_compilerproc in aktcallnode.procdefinition.procoptions) then make_not_regable(left,[ra_addr_regable])
make_not_regable(left,[ra_addr_regable,ra_addr_taken])
else
make_not_regable(left,[ra_addr_regable])
end; end;
else else
set_varstate(left,vs_read,[vsf_must_be_valid]); set_varstate(left,vs_read,[vsf_must_be_valid]);

8
compiler/optloop.pas
View File

@ -113,7 +113,13 @@ unit optloop;
if not(node.nodetype in [forn]) then if not(node.nodetype in [forn]) then
exit; exit;
unrolls:=number_unrolls(tfornode(node).t2); unrolls:=number_unrolls(tfornode(node).t2);
if unrolls>1 then if (unrolls>1) and
((tfornode(node).left.nodetype<>loadn) or
{ the address of the counter variable might be taken if it is passed by constref to a
subroutine, so really check if it is not taken }
((tfornode(node).left.nodetype=loadn) and (tloadnode(tfornode(node).left).symtableentry is tabstractvarsym) and
not(tabstractvarsym(tloadnode(tfornode(node).left).symtableentry).addr_taken))
) then
begin begin
{ number of executions known? } { number of executions known? }
if (tfornode(node).right.nodetype=ordconstn) and (tfornode(node).t1.nodetype=ordconstn) then if (tfornode(node).right.nodetype=ordconstn) and (tfornode(node).t1.nodetype=ordconstn) then