summaryrefslogtreecommitdiff
path: root/compiler/jvm
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2019-04-13 15:16:09 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2019-04-13 15:16:09 +0000
commit0b465119036f2f2f24794d864074685324581eab (patch)
tree1ef52cb369b0f0c2943ff0bf8873b10f590e630b /compiler/jvm
parent5dea836b64ccbde1960504207e5c2d6b6bd9028e (diff)
parent0f67757f6d58a76bb4d561777a67f26c93d8c8f4 (diff)
downloadfpc-0b465119036f2f2f24794d864074685324581eab.tar.gz
* synchronised with trunk till r40776
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/debug_eh@41867 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/jvm')
-rw-r--r--compiler/jvm/njvmutil.pas2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/jvm/njvmutil.pas b/compiler/jvm/njvmutil.pas
index c412ec43e1..bc9cdad852 100644
--- a/compiler/jvm/njvmutil.pas
+++ b/compiler/jvm/njvmutil.pas
@@ -404,7 +404,7 @@ implementation
{ class constructors are automatically handled by the JVM }
{ call the unit init code and make it external }
- if (hp.u.flags and (uf_init or uf_finalize))<>0 then
+ if (hp.u.moduleflags*[mf_init,mf_finalize])<>[] then
begin
{ trigger init code by referencing the class representing the
unit; if necessary, it will register the fini code to run on