paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 06:29:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

* set reused left node to nil for JVM loadvmtaddrnodes that need to call a

Browse Source 
helper
  * never call a helper for classrefdefs (in that case we have to load the
    classrefdef itself, not the classrefdef for the class representing
    classrefdefs)

git-svn-id: branches/jvmbackend@18575 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:11:54 +00:00
parent 0706cb5eb6
commit 1dca48bce5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/nmem.pas
View File

@ -236,7 +236,8 @@ implementation
left:=nil; left:=nil;
end end
else if is_javaclass(left.resultdef) and else if is_javaclass(left.resultdef) and
(left.nodetype<>typen) then (left.nodetype<>typen) and
(left.resultdef.typ<>classrefdef) then
begin begin
{ call java.lang.Object.getClass() } { call java.lang.Object.getClass() }
vs:=search_struct_member(tobjectdef(left.resultdef),'GETCLASS'); vs:=search_struct_member(tobjectdef(left.resultdef),'GETCLASS');
@ -245,6 +246,8 @@ implementation
internalerror(2011041901); internalerror(2011041901);
result:=ccallnode.create(nil,tprocsym(vs),vs.owner,left,[]); result:=ccallnode.create(nil,tprocsym(vs),vs.owner,left,[]);
inserttypeconv_explicit(result,resultdef); inserttypeconv_explicit(result,resultdef);
{ reused }
left:=nil;
end end
else else
firstpass(left) firstpass(left)