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

* give warning for unreachable code in while/if statements

Browse Source
This commit is contained in:
peter 2005-01-16 10:50:32 +00:00
parent 3a9740ab12
commit 4c5833ddf9
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
compiler/nflw.pas
View File

@ -395,10 +395,17 @@ implementation
set_varstate(left,vs_used,true); set_varstate(left,vs_used,true);
if codegenerror then if codegenerror then
exit; exit;
if not is_boolean(left.resulttype.def) then if not is_boolean(left.resulttype.def) then
CGMessage1(type_e_boolean_expr_expected,left.resulttype.def.typename);
{ optimize constant expressions }
if (left.nodetype=ordconstn) and
(tordconstnode(left).value=0) then
begin begin
CGMessage1(type_e_boolean_expr_expected,left.resulttype.def.typename); if assigned(right) then
exit; CGMessagePos(right.fileinfo,cg_w_unreachable_code);
result:=cnothingnode.create;
end; end;
end; end;
@ -561,13 +568,37 @@ implementation
if not is_boolean(left.resulttype.def) then if not is_boolean(left.resulttype.def) then
Message1(type_e_boolean_expr_expected,left.resulttype.def.typename); Message1(type_e_boolean_expr_expected,left.resulttype.def.typename);
{ optimize constant expressions }
if left.nodetype=ordconstn then
begin
if tordconstnode(left).value=1 then
begin
if assigned(right) then
result:=right
else
result:=cnothingnode.create;
right:=nil;
if assigned(t1) then
CGMessagePos(t1.fileinfo,cg_w_unreachable_code);
end
else
begin
if assigned(t1) then
result:=t1
else
result:=cnothingnode.create;
t1:=nil;
if assigned(right) then
CGMessagePos(right.fileinfo,cg_w_unreachable_code);
end;
end;
end; end;
function tifnode.pass_1 : tnode; function tifnode.pass_1 : tnode;
var var
old_t_times : longint; old_t_times : longint;
hp : tnode;
begin begin
result:=nil; result:=nil;
expectloc:=LOC_VOID; expectloc:=LOC_VOID;
@ -620,31 +651,6 @@ implementation
if codegenerror then if codegenerror then
exit; exit;
if left.nodetype=ordconstn then
begin
{ optimize }
if tordconstnode(left).value=1 then
begin
hp:=right;
right:=nil;
{ we cannot set p to nil !!! }
if assigned(hp) then
result:=hp
else
result:=cnothingnode.create;
end
else
begin
hp:=t1;
t1:=nil;
{ we cannot set p to nil !!! }
if assigned(hp) then
result:=hp
else
result:=cnothingnode.create;
end;
end;
cg.t_times:=old_t_times; cg.t_times:=old_t_times;
end; end;
@ -682,8 +688,6 @@ implementation
end; end;
function tfornode.det_resulttype:tnode; function tfornode.det_resulttype:tnode;
var
hp : tnode;
begin begin
result:=nil; result:=nil;
resulttype:=voidtype; resulttype:=voidtype;
@ -1425,7 +1429,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.104 2005-01-03 17:55:57 florian Revision 1.105 2005-01-16 10:50:32 peter
* give warning for unreachable code in while/if statements
Revision 1.104 2005/01/03 17:55:57 florian
+ first batch of patches to support tdef.getcopy fully + first batch of patches to support tdef.getcopy fully
Revision 1.103 2004/12/26 16:22:01 peter Revision 1.103 2004/12/26 16:22:01 peter