diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-12-24 22:12:19 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-12-24 22:12:19 +0000 |
| commit | a142ff06bcd482d496aa8c96d3294c651d31965a (patch) | |
| tree | fdb916e044a395791a45a28d197d2e6c1764d6b8 /compiler/jvm | |
| parent | 636ae0b1f820d20b64ccfc2146aa6e99783547cf (diff) | |
| parent | 5654f1a2ebf9871ac052d7825076e468d01b52b9 (diff) | |
| download | fpc-a142ff06bcd482d496aa8c96d3294c651d31965a.tar.gz | |
* synchronised with trunk till r40635
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/debug_eh@40636 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/jvm')
| -rw-r--r-- | compiler/jvm/pjvm.pas | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/jvm/pjvm.pas b/compiler/jvm/pjvm.pas index 698b4feac4..75b73d6c3d 100644 --- a/compiler/jvm/pjvm.pas +++ b/compiler/jvm/pjvm.pas @@ -505,7 +505,7 @@ implementation { add a method to call the procvar using unwrapped arguments, which then wraps them and calls through to JLRMethod.invoke } - methoddef:=tprocdef(tprocvardef(def).getcopyas(procdef,pc_bareproc)); + methoddef:=tprocdef(tprocvardef(def).getcopyas(procdef,pc_bareproc,'')); finish_copied_procdef(methoddef,'invoke',pvclass.symtable,pvclass); insert_self_and_vmt_para(methoddef); insert_funcret_para(methoddef); @@ -540,7 +540,7 @@ implementation { add a method prototype matching the procvar (like the invoke in the procvarclass itself) } symtablestack.push(pvintf.symtable); - methoddef:=tprocdef(tprocvardef(def).getcopyas(procdef,pc_bareproc)); + methoddef:=tprocdef(tprocvardef(def).getcopyas(procdef,pc_bareproc,'')); finish_copied_procdef(methoddef,name+'Callback',pvintf.symtable,pvintf); insert_self_and_vmt_para(methoddef); insert_funcret_para(methoddef); @@ -639,7 +639,7 @@ implementation wrapperpd.synthetickind:=tsk_jvm_virtual_clmethod; wrapperpd.skpara:=pd; { also create procvar type that we can use in the implementation } - wrapperpv:=tcpuprocvardef(pd.getcopyas(procvardef,pc_normal)); + wrapperpv:=tcpuprocvardef(pd.getcopyas(procvardef,pc_normal,'')); wrapperpv.calcparas; { no use in creating a callback wrapper here, this procvar type isn't for public consumption } @@ -667,7 +667,7 @@ implementation { wrapper is part of the same symtable as the original procdef } symtablestack.push(pd.owner); { get a copy of the constructor } - wrapperpd:=tprocdef(pd.getcopyas(procdef,pc_bareproc)); + wrapperpd:=tprocdef(pd.getcopyas(procdef,pc_bareproc,'')); { this one is a class method rather than a constructor } include(wrapperpd.procoptions,po_classmethod); wrapperpd.proctypeoption:=potype_function; |