From 8fcc8f92ca8511170ff26a21ed33de0c3ce46090 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 20 Aug 2011 08:29:11 +0000
Subject: [PATCH]   * allow taking the address of var-parameters in normal
 Pascal code (not just     via internal njvmaddrnodes), because we need it for
 procvar dispatching

git-svn-id: branches/jvmbackend@18732 -
---
 compiler/jvm/njvmmem.pas | 59 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/compiler/jvm/njvmmem.pas b/compiler/jvm/njvmmem.pas
index ef7ec421de..8ab70b3a75 100644
--- a/compiler/jvm/njvmmem.pas
+++ b/compiler/jvm/njvmmem.pas
@@ -56,8 +56,8 @@ implementation
       systems,globals,
       cutils,verbose,constexp,
       symconst,symtype,symtable,symsym,symdef,defutil,jvmdef,
-      htypechk,
-      nadd,ncal,ncnv,ncon,pass_1,njvmcon,
+      htypechk,paramgr,
+      nadd,ncal,ncnv,ncon,nld,pass_1,njvmcon,
       aasmdata,aasmcpu,pass_2,
       cgutils,hlcgobj,hlcgcpu;
 
@@ -203,11 +203,19 @@ implementation
           end
         else
           begin
-            if not(nf_internal in flags) and
-               not jvmimplicitpointertype(left.resultdef) then
+            if not jvmimplicitpointertype(left.resultdef) then
               begin
-                CGMessage(parser_e_illegal_expression);
-                exit
+                { allow taking the address of a copy-out parameter (it's an
+                  array reference) }
+                if (left.nodetype<>loadn) or
+                   (tloadnode(left).symtableentry.typ<>paravarsym) or
+                   not paramanager.push_copyout_param(tparavarsym(tloadnode(left).symtableentry).varspez,
+                     left.resultdef,
+                     tabstractprocdef(tloadnode(left).symtableentry.owner.defowner).proccalloption) then
+                  begin
+                    CGMessage(parser_e_illegal_expression);
+                    exit
+                  end;
               end;
             result:=inherited;
           end;
@@ -220,31 +228,24 @@ implementation
       begin
         secondpass(left);
         implicitptr:=jvmimplicitpointertype(left.resultdef);
-        if implicitptr or
-           (nf_internal in flags) then
-          begin
-            if implicitptr then
-              { this is basically a typecast: the left node is an implicit
-                pointer, and we typecast it to a regular 'pointer'
-                (java.lang.Object) }
-              location_copy(location,left.location)
-            else
-              begin
-                { these are always arrays (used internally for pointers to var
-                  parameters stored in nestedfpstructs) -> get base pointer to
-                  array }
-                if (left.location.loc<>LOC_REFERENCE) or
-                   (left.location.reference.arrayreftype<>art_indexconst) or
-                   (left.location.reference.base=NR_NO) or
-                   assigned(left.location.reference.symbol) then
-                  internalerror(2011060701);
-                location_reset(location,LOC_REGISTER,OS_ADDR);
-                location.register:=left.location.reference.base;
-              end;
-          end
+        if implicitptr then
+          { this is basically a typecast: the left node is an implicit
+            pointer, and we typecast it to a regular 'pointer'
+            (java.lang.Object) }
+          location_copy(location,left.location)
         else
           begin
-            internalerror(2011051601);
+            { these are always arrays (used internally for pointers to var
+              parameters stored in nestedfpstructs) -> get base pointer to
+              array }
+            if (left.location.loc<>LOC_REFERENCE) or
+               (left.location.reference.arrayreftype<>art_indexconst) or
+               (left.location.reference.base=NR_NO) or
+               (left.location.reference.indexoffset<>0) or
+               assigned(left.location.reference.symbol) then
+              internalerror(2011060701);
+            location_reset(location,LOC_REGISTER,OS_ADDR);
+            location.register:=left.location.reference.base;
           end;
       end;