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

+ fold the constructs @<record type>(nil^).<field >) and @<record point>(nil)^.<field> used to get the offset of a field into a constant

Browse Source 
git-svn-id: trunk@31470 -
This commit is contained in:
florian 2015-08-31 20:03:49 +00:00
parent 495b7181a8
commit 049491a573
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -10723,6 +10723,7 @@ tests/tbs/tb0608.pp svneol=native#text/pascal
tests/tbs/tb0609.pp svneol=native#text/plain
tests/tbs/tb0610.pp svneol=native#text/pascal
tests/tbs/tb0611.pp svneol=native#text/pascal
tests/tbs/tb0612.pp svneol=native#text/pascal
tests/tbs/tb205.pp svneol=native#text/plain
tests/tbs/tb610.pp svneol=native#text/pascal
tests/tbs/tbs0594.pp svneol=native#text/pascal

27
compiler/nmem.pas
View File

@ -83,6 +83,7 @@ interface
function dogetcopy : tnode;override;
function pass_1 : tnode;override;
function pass_typecheck:tnode;override;
function simplify(forinline : boolean) : tnode; override;
protected
mark_read_written: boolean;
function typecheck_non_proc(realsource: tnode; out res: tnode): boolean; virtual;
@ -597,6 +598,32 @@ implementation
{ vsf_referred_not_inited }
set_varstate(left,vs_read,[vsf_must_be_valid]);
end;
if not(assigned(result)) then
result:=simplify(false);
end;
function taddrnode.simplify(forinline : boolean) : tnode;
var
hsym : tfieldvarsym;
begin
result:=nil;
if ((left.nodetype=subscriptn) and
(tsubscriptnode(left).left.nodetype=derefn) and
(tsubscriptnode(left).left.resultdef.typ=recorddef) and
(tderefnode(tsubscriptnode(left).left).left.nodetype=niln)) or
((left.nodetype=subscriptn) and
(tsubscriptnode(left).left.nodetype=typeconvn) and
(tsubscriptnode(left).left.resultdef.typ=recorddef) and
(ttypeconvnode(tsubscriptnode(left).left).left.nodetype=derefn) and
(tderefnode(ttypeconvnode(tsubscriptnode(left).left).left).left.nodetype=niln)) then
begin
hsym:=tsubscriptnode(left).vs;
if tabstractrecordsymtable(hsym.owner).is_packed then
result:=cpointerconstnode.create(hsym.fieldoffset div 8,resultdef)
else
result:=cpointerconstnode.create(hsym.fieldoffset,resultdef);
end;
end;

24
tests/tbs/tb0612.pp Normal file
View File

@ -0,0 +1,24 @@
type
trec1 = record
l : longint;
b : byte;
end;
prec1 = ^trec1;
trec2 = packed record
a1 : array[0..3] of byte;
b : byte;
end;
prec2 = ^trec2;
begin
if ptruint(@trec1(nil^).b)<>4 then
halt(1);
if ptruint(@prec1(nil)^.b)<>4 then
halt(2);
if ptruint(@trec2(nil^).b)<>4 then
halt(3);
if ptruint(@prec2(nil)^.b)<>4 then
halt(4);
end.