From commits-return-7644-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Thu Nov 8 11:33:31 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 41FF5180671 for ; Thu, 8 Nov 2018 11:33:31 +0100 (CET) Received: (qmail 80533 invoked by uid 500); 8 Nov 2018 10:33:30 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 80524 invoked by uid 99); 8 Nov 2018 10:33:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2018 10:33:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3D673DFD6B; Thu, 8 Nov 2018 10:33:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Message-Id: <891504c285094e90b3b7e4d3de270dfe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: GROOVY-8871: Long Constants Defined in Groovy 2.5.3 Under OpenJDK 11 Cause an IllegalAccessError Date: Thu, 8 Nov 2018 10:33:30 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X 3e4173039 -> 8a9c78f69 GROOVY-8871: Long Constants Defined in Groovy 2.5.3 Under OpenJDK 11 Cause an IllegalAccessError Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8a9c78f6 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8a9c78f6 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8a9c78f6 Branch: refs/heads/GROOVY_2_5_X Commit: 8a9c78f696fdf8a23104bf037e2559b4fcfadc74 Parents: 3e41730 Author: Paul King Authored: Thu Nov 8 20:32:28 2018 +1000 Committer: Paul King Committed: Thu Nov 8 20:33:18 2018 +1000 ---------------------------------------------------------------------- src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/8a9c78f6/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java b/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java index 4c7230e..c9313dd 100644 --- a/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java +++ b/src/main/java/org/codehaus/groovy/control/OptimizerVisitor.java @@ -113,8 +113,9 @@ public class OptimizerVisitor extends ClassCodeExpressionTransformer { do { name = "$const$" + index++; } while (currentClass.getDeclaredField(name) != null); + // TODO consider moving initcode to and remaking field final field = new FieldNode(name, - Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_FINAL, + Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC, constantExpression.getType(), currentClass, constantExpression);