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

compiler: calculate offset of record fields in taddrnode (based on patch of Jeppe Johansen, fixes bug #0019357)

Browse Source 
git-svn-id: trunk@23428 -
This commit is contained in:
paul 2013-01-17 14:30:55 +00:00
parent 3a3c10a474
commit 65cbb4e9ba
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -12918,6 +12918,7 @@ tests/webtbs/tw1931.pp svneol=native#text/plain
tests/webtbs/tw1932.pp svneol=native#text/plain tests/webtbs/tw1932.pp svneol=native#text/plain
tests/webtbs/tw19325.pp svneol=native#text/pascal tests/webtbs/tw19325.pp svneol=native#text/pascal
tests/webtbs/tw1935.pp svneol=native#text/plain tests/webtbs/tw1935.pp svneol=native#text/plain
tests/webtbs/tw19357.pp svneol=native#text/pascal
tests/webtbs/tw1936.pp svneol=native#text/plain tests/webtbs/tw1936.pp svneol=native#text/plain
tests/webtbs/tw19368.pp svneol=native#text/pascal tests/webtbs/tw19368.pp svneol=native#text/pascal
tests/webtbs/tw1938.pp svneol=native#text/plain tests/webtbs/tw1938.pp svneol=native#text/plain

12
compiler/nmem.pas
View File

@ -466,6 +466,7 @@ implementation
hp : tnode; hp : tnode;
hsym : tfieldvarsym; hsym : tfieldvarsym;
isprocvar : boolean; isprocvar : boolean;
offset: asizeint;
begin begin
result:=nil; result:=nil;
typecheckpass(left); typecheckpass(left);
@ -574,10 +575,17 @@ implementation
{$endif i386} {$endif i386}
(tabsolutevarsym(tloadnode(hp).symtableentry).abstyp=toaddr) then (tabsolutevarsym(tloadnode(hp).symtableentry).abstyp=toaddr) then
begin begin
offset:=tabsolutevarsym(tloadnode(hp).symtableentry).addroffset;
hp:=left;
while assigned(hp) and (hp.nodetype=subscriptn) do
begin
inc(offset,tsubscriptnode(hp).vs.fieldoffset);
hp:=tunarynode(hp).left;
end;
if nf_typedaddr in flags then if nf_typedaddr in flags then
result:=cpointerconstnode.create(tabsolutevarsym(tloadnode(hp).symtableentry).addroffset,getpointerdef(left.resultdef)) result:=cpointerconstnode.create(offset,getpointerdef(left.resultdef))
else else
result:=cpointerconstnode.create(tabsolutevarsym(tloadnode(hp).symtableentry).addroffset,voidpointertype); result:=cpointerconstnode.create(offset,voidpointertype);
exit; exit;
end end
else if (nf_internal in flags) or else if (nf_internal in flags) or

25
tests/webtbs/tw19357.pp Normal file
View File

@ -0,0 +1,25 @@
program tw19357;
type
TLvl0 = packed record
a,b: longword;
end;
TTest = packed record
a,b: longword;
c: TLvl0;
end;
var
h: TTest absolute 100;
const
x: pointer = @h.c.b;
begin
if ptruint(@h.a) <> 100 then
halt(1);
if ptruint(@h.b) <> 104 then
halt(2);
if ptruint(@h.c.b) <> 112 then
halt(3);
if ptruint(x) <> 112 then
halt(4);
end.