Fix jvm compiler compilation failure after rev 25013

git-svn-id: trunk@25028 -
This commit is contained in:
pierre 2013-07-02 12:52:32 +00:00
parent 1ffcb9c1e6
commit eb1ff90de1
3 changed files with 8 additions and 7 deletions

View File

@ -124,7 +124,7 @@ implementation
begin
parent:=tunarynode(p);
{ skip typeconversions that don't change the node type }
p:=p.actualtargetnode;
p:=actualtargetnode(@p)^;
end;
derefn:
begin
@ -239,8 +239,8 @@ implementation
local variables (fields, arrays etc are all initialized on creation) }
verifyout:=
(cs_check_var_copyout in current_settings.localswitches) and
((left.actualtargetnode.nodetype<>loadn) or
(tloadnode(left.actualtargetnode).symtableentry.typ<>localvarsym));
((actualtargetnode(@left)^.nodetype<>loadn) or
(tloadnode(actualtargetnode(@left)^).symtableentry.typ<>localvarsym));
{ in case of a non-out parameter, pass in the original value (also
always in case of implicitpointer type, since that pointer points to

View File

@ -62,7 +62,7 @@ implementation
uses
verbose,globals,
nbas,nld,ncal,ncon,ninl,nmem,ncnv,
nbas,nld,ncal,ncon,ninl,nmem,ncnv,nutils,
symconst,symsym,symdef,symtable,defutil,jvmdef,
paramgr,
pass_1,
@ -100,7 +100,7 @@ function tjvmassignmentnode.pass_1: tnode;
{ intercept writes to string elements, because Java strings are immutable
-> detour via StringBuilder
}
target:=left.actualtargetnode;
target:=actualtargetnode(@left)^;
if (target.nodetype=vecn) and
(is_wide_or_unicode_string(tvecnode(target).left.resultdef) or
is_ansistring(tvecnode(target).left.resultdef)) then

View File

@ -63,7 +63,8 @@ implementation
aasmbase,
symconst,symtype,symtable,symsym,symdef,defutil,jvmdef,
htypechk,paramgr,
nadd,ncal,ncnv,ncon,nld,pass_1,njvmcon,
nadd,ncal,ncnv,ncon,nld,nutils,
pass_1,njvmcon,
aasmdata,aasmcpu,pass_2,
cgutils,hlcgobj,hlcgcpu;
@ -151,7 +152,7 @@ implementation
var
target: tnode;
begin
target:=left.actualtargetnode;
target:=actualtargetnode(@left)^;
result:=
(left.nodetype=derefn);
end;