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

* factored out inlinenode check whether it may have a side effect

Browse Source 
o also added register assert as having a side-effect (if asserts are
     enabled)

git-svn-id: trunk@42728 -
This commit is contained in:
Jonas Maebe 2019-08-18 15:55:03 +00:00
parent 5d1d9858d1
commit 14a7429e19
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/ninl.pas
View File

@ -53,6 +53,8 @@ interface
function first_pack_unpack: tnode; virtual;
property parameters : tnode read left write left;
function may_have_sideeffect_norecurse: boolean;
protected
{ All the following routines currently
call compilerprocs, unless they are
@ -5267,6 +5269,20 @@ implementation
result := loop;
end;
function tinlinenode.may_have_sideeffect_norecurse: boolean;
begin
result:=
(inlinenumber in [in_write_x,in_writeln_x,in_read_x,in_readln_x,in_str_x_string,
in_val_x,in_reset_x,in_rewrite_x,in_reset_typedfile,in_rewrite_typedfile,
in_reset_typedfile_name,in_rewrite_typedfile_name,in_settextbuf_file_x,
in_inc_x,in_dec_x,in_include_x_y,in_exclude_x_y,in_break,in_continue,in_setlength_x,
in_finalize_x,in_new_x,in_dispose_x,in_exit,in_copy_x,in_initialize_x,in_leave,in_cycle,
in_and_assign_x_y,in_or_assign_x_y,in_xor_assign_x_y,in_sar_assign_x_y,in_shl_assign_x_y,
in_shr_assign_x_y,in_rol_assign_x_y,in_ror_assign_x_y,in_neg_assign_x,in_not_assign_x]) or
((inlinenumber = in_assert_x_y) and
(cs_do_assertion in localswitches));
end;
function tinlinenode.first_fma: tnode;
begin

22
compiler/nutils.pas
View File

@ -1375,20 +1375,14 @@ implementation
begin
result:=fen_false;
if (n.nodetype in [assignn,calln,asmn,finalizetempsn]) or
((n.nodetype=inlinen) and
(tinlinenode(n).inlinenumber in [in_write_x,in_writeln_x,in_read_x,in_readln_x,in_str_x_string,
in_val_x,in_reset_x,in_rewrite_x,in_reset_typedfile,in_rewrite_typedfile,
in_reset_typedfile_name,in_rewrite_typedfile_name,in_settextbuf_file_x,
in_inc_x,in_dec_x,in_include_x_y,in_exclude_x_y,in_break,in_continue,in_setlength_x,
in_finalize_x,in_new_x,in_dispose_x,in_exit,in_copy_x,in_initialize_x,in_leave,in_cycle,
in_and_assign_x_y,in_or_assign_x_y,in_xor_assign_x_y,in_sar_assign_x_y,in_shl_assign_x_y,
in_shr_assign_x_y,in_rol_assign_x_y,in_ror_assign_x_y,in_neg_assign_x,in_not_assign_x])
) or
((mhs_exceptions in pmhs_flags(arg)^) and
((n.nodetype in [derefn,vecn,subscriptn]) or
((n.nodetype in [addn,subn,muln,divn,slashn,unaryminusn]) and (n.localswitches*[cs_check_overflow,cs_check_range]<>[]))
)
) then
((n.nodetype=inlinen) and
tinlinenode(n).may_have_sideeffect_norecurse
) or
((mhs_exceptions in pmhs_flags(arg)^) and
((n.nodetype in [derefn,vecn,subscriptn]) or
((n.nodetype in [addn,subn,muln,divn,slashn,unaryminusn]) and (n.localswitches*[cs_check_overflow,cs_check_range]<>[]))
)
) then
result:=fen_norecurse_true;
end;