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

* handle enums with a packenum setting that is larger than necessary to store

Browse Source 
all of their values, when kept in a bitpacked array, properly via
    pass_typecheck rather than hacking location.size in pass_generate_code:
   o the old fix was incomplete (it didn't handle non-constant indices)
   o the old fix didn't work for llvm (since it uses defs rather than
     location.size)

git-svn-id: trunk@33943 -
This commit is contained in:
Jonas Maebe 2016-06-09 22:00:14 +00:00
parent f55a403270
commit 5af40f22e8
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/ncgmem.pas
View File

@ -1030,13 +1030,6 @@ implementation
update_reference_offset(location.reference,extraoffset,bytemulsize);
{ adjust alignment after this change }
location.reference.alignment:=newalignment(location.reference.alignment,extraoffset*bytemulsize);
{ don't do this for floats etc.; needed to properly set the }
{ size for bitpacked arrays (e.g. a bitpacked array of }
{ enums who are size 2 but fit in one byte -> in the array }
{ they will be one byte and have to be stored like that) }
if is_packed_array(left.resultdef) and
(tcgsize2size[newsize] <> bytemulsize) then
newsize:=int_cgsize(bytemulsize);
end
else
begin

13
compiler/nmem.pas
View File

@ -1037,6 +1037,19 @@ implementation
hightree.free;
end;
end;
{ in case of a bitpacked array of enums that are size 2 (due to
packenum 2) but whose values all fit in one byte, the size of
bitpacked array elements will be 1 byte while the resultdef of
will currently say it's two bytes) -> create a temp enumdef
with packenum=1 for the resultdef as subtype of the main
enumdef }
if is_enum(resultdef) and
is_packed_array(left.resultdef) and
((tarraydef(left.resultdef).elepackedbitsize div 8) <> resultdef.size) then
begin
resultdef:=cenumdef.create_subrange(tenumdef(resultdef),tenumdef(resultdef).min,tenumdef(resultdef).max);
tenumdef(resultdef).calcsavesize(1);
end
end;
pointerdef :
begin

3
tests/test/tparray12.pp
View File

@ -14,7 +14,8 @@ begin
a[3]:=ec;
a[6]:=ef;
a[5]:=ee;
a[4]:=ed;
i:=4;
a[i]:=ed;
for i := 1 to 6 do
begin writeln(tb(a)[i]);
if (tb(a)[i] <> res[i]) then