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

* check range of enums and booleans in typed constant expressions when

Browse Source 
using the asmlist generator (mantis #24428)

git-svn-id: trunk@24495 -
This commit is contained in:
Jonas Maebe 2013-05-14 12:05:00 +00:00
parent f174c4df83
commit 11d5d4f79d
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -12321,6 +12321,8 @@ tests/webtbf/tw24013b.pp svneol=native#text/plain
tests/webtbf/tw2403.pp svneol=native#text/plain
tests/webtbf/tw2414.pp svneol=native#text/plain
tests/webtbf/tw24184.pp svneol=native#text/plain
tests/webtbf/tw24428.pp svneol=native#text/plain
tests/webtbf/tw24428a.pp svneol=native#text/plain
tests/webtbf/tw2478.pp svneol=native#text/plain
tests/webtbf/tw2562.pp svneol=native#text/plain
tests/webtbf/tw2657.pp svneol=native#text/plain

21
compiler/ngtcon.pas
View File

@ -602,7 +602,10 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
bool8bit :
begin
if is_constboolnode(node) then
list.concat(Tai_const.Create_8bit(byte(tordconstnode(node).value.svalue)))
begin
testrange(def,tordconstnode(node).value,false,false);
list.concat(Tai_const.Create_8bit(byte(tordconstnode(node).value.svalue)))
end
else
do_error;
end;
@ -610,7 +613,10 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
bool16bit :
begin
if is_constboolnode(node) then
list.concat(Tai_const.Create_16bit(word(tordconstnode(node).value.svalue)))
begin
testrange(def,tordconstnode(node).value,false,false);
list.concat(Tai_const.Create_16bit(word(tordconstnode(node).value.svalue)))
end
else
do_error;
end;
@ -618,7 +624,10 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
bool32bit :
begin
if is_constboolnode(node) then
list.concat(Tai_const.Create_32bit(longint(tordconstnode(node).value.svalue)))
begin
testrange(def,tordconstnode(node).value,false,false);
list.concat(Tai_const.Create_32bit(longint(tordconstnode(node).value.svalue)))
end
else
do_error;
end;
@ -626,7 +635,10 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
bool64bit :
begin
if is_constboolnode(node) then
list.concat(Tai_const.Create_64bit(int64(tordconstnode(node).value.svalue)))
begin
testrange(def,tordconstnode(node).value,false,false);
list.concat(Tai_const.Create_64bit(int64(tordconstnode(node).value.svalue)))
end
else
do_error;
end;
@ -1019,6 +1031,7 @@ function get_next_varsym(def: tabstractrecorddef; const SymList:TFPHashObjectLis
if equal_defs(node.resultdef,def) or
is_subequal(node.resultdef,def) then
begin
testrange(def,tordconstnode(node).value,false,false);
case longint(node.resultdef.size) of
1 : list.concat(Tai_const.Create_8bit(Byte(tordconstnode(node).value.svalue)));
2 : list.concat(Tai_const.Create_16bit(Word(tordconstnode(node).value.svalue)));

8
tests/webtbf/tw24428.pp Normal file
View File

@ -0,0 +1,8 @@
{ %fail }
{$r+}
type abcd = (a, b, c, d);
const cd: c..d = a;
begin
end.

8
tests/webtbf/tw24428a.pp Normal file
View File

@ -0,0 +1,8 @@
{ %fail }
{$r+}
type tt = True..True;
const t: tt = False;
begin
end.