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

* fixed cbool "and" with full boolean evaluation, and cbool "xor"

Browse Source 
(mantis #35272)

git-svn-id: trunk@42167 -
This commit is contained in:
Jonas Maebe 2019-06-02 20:04:06 +00:00
parent dc681a75ec
commit eab079c7bd
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -16628,6 +16628,7 @@ tests/webtbs/tw35187.pp svneol=native#text/pascal
tests/webtbs/tw35224.pp svneol=native#text/plain
tests/webtbs/tw3523.pp svneol=native#text/plain
tests/webtbs/tw35233.pp svneol=native#text/plain
tests/webtbs/tw35272.pp svneol=native#text/plain
tests/webtbs/tw3529.pp svneol=native#text/plain
tests/webtbs/tw3531.pp svneol=native#text/plain
tests/webtbs/tw3533.pp svneol=native#text/plain

34
compiler/nadd.pas
View File

@ -1650,6 +1650,40 @@ implementation
andn,
orn:
begin
{ in case of xor, or 'and' with full and cbool: convert both to Pascal bool and then
perform the xor/and to prevent issues with "longbool(1) and/xor
longbool(2)" }
if (is_cbool(ld) or is_cbool(rd)) and
((nodetype=xorn) or
((nodetype=andn) and
((cs_full_boolean_eval in current_settings.localswitches) or
not(nf_short_bool in flags)
)
)
) then
begin
resultdef:=nil;
if is_cbool(ld) then
begin
inserttypeconv(left,pasbool8type);
ttypeconvnode(left).convtype:=tc_bool_2_bool;
if not is_cbool(rd) or
(ld.size>=rd.size) then
resultdef:=ld;
end;
if is_cbool(rd) then
begin
inserttypeconv(right,pasbool8type);
ttypeconvnode(right).convtype:=tc_bool_2_bool;
if not assigned(resultdef) then
resultdef:=rd;
end;
result:=ctypeconvnode.create_explicit(caddnode.create(nodetype,left,right),resultdef);
ttypeconvnode(result).convtype:=tc_bool_2_bool;
left:=nil;
right:=nil;
exit;
end;
{ Make sides equal to the largest boolean }
if (torddef(left.resultdef).size>torddef(right.resultdef).size) or
(is_cbool(left.resultdef) and not is_cbool(right.resultdef)) then

19
tests/webtbs/tw35272.pp Normal file
View File

@ -0,0 +1,19 @@
var
b1, b2, b3: longbool;
begin
b1:=longbool(1);
b2:=longbool(2);
b3:=b1 and b2;
if not b3 then
halt(1);
b3:=b1 xor b2;
if b3 then
halt(2);
{$b+}
b3:=b1 and b2;
if not b3 then
halt(3);
b3:=b1 xor b2;
if b3 then
halt(4);
end.