You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2022/12/10 09:35:24 UTC

[groovy] branch danielsun/enable-indy-by-default-20221205 updated (ee57f80502 -> 8d8852b466)

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch danielsun/enable-indy-by-default-20221205
in repository https://gitbox.apache.org/repos/asf/groovy.git


 discard ee57f80502 Enable indy by default
     add 72cb48a865 GROOVY-10861: bootstrap parameters directly passed
     add 14194be9e3 GROOVY-10862: vmplugin: `MethodNode` non-null default value
     add adfef9b63f Bump com.gradle.enterprise from 3.11.4 to 3.12
     new 8d8852b466 Enable indy by default

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ee57f80502)
            \
             N -- N -- N   refs/heads/danielsun/enable-indy-by-default-20221205 (8d8852b466)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 settings.gradle                                    |  2 +-
 .../ast/decompiled/MemberSignatureParser.java      | 13 +++----
 .../groovy/classgen/AnnotationVisitor.java         | 10 ++---
 .../asm/sc/AbstractFunctionalInterfaceWriter.java  | 27 +++++--------
 .../classgen/asm/sc/StaticTypesLambdaWriter.java   | 10 ++---
 ...StaticTypesMethodReferenceExpressionWriter.java | 24 +++++-------
 .../org/codehaus/groovy/vmplugin/v8/Java8.java     | 44 ++++++++++------------
 .../org/codehaus/groovy/ast/MethodNodeTest.groovy  | 17 +++++++++
 .../stubgenerator/InnerAnnotationStubTest.groovy   | 30 ++++++---------
 .../groovy/transform/DelegateTransformTest.groovy  |  5 ++-
 .../traitx/TraitASTTransformationTest.groovy       |  2 +-
 11 files changed, 86 insertions(+), 98 deletions(-)


[groovy] 01/01: Enable indy by default

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch danielsun/enable-indy-by-default-20221205
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 8d8852b466683d166a012e9a36c5ec3d6b801944
Author: Daniel Sun <su...@apache.org>
AuthorDate: Mon Dec 5 01:43:08 2022 +0800

    Enable indy by default
---
 .../java/org/codehaus/groovy/classgen/asm/WriterController.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java b/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
index 39f05cb26e..97b7000f87 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
@@ -76,18 +76,20 @@ public class WriterController {
     public void init(final AsmClassGenerator asmClassGenerator, final GeneratorContext gcon, final ClassVisitor cv, final ClassNode cn) {
         CompilerConfiguration config = cn.getCompileUnit().getConfig();
         Map<String,Boolean> optOptions = config.getOptimizationOptions();
-        boolean invokedynamic = false;
+        boolean invokedynamic = true;
         if (optOptions.isEmpty()) {
             // IGNORE
         } else if (Boolean.FALSE.equals(optOptions.get("all"))) {
+            invokedynamic = false;
             this.optimizeForInt = false;
             // set other optimizations options to false here
         } else {
-            if (config.isIndyEnabled()) invokedynamic = true;
+            if (!config.isIndyEnabled()) invokedynamic = false;
             if (Boolean.FALSE.equals(optOptions.get("int"))) this.optimizeForInt = false;
-            if (invokedynamic) this.optimizeForInt = false;
             // set other optimizations options to false here
         }
+        if (invokedynamic) this.optimizeForInt = false;
+
         this.classNode = cn;
         this.outermostClass = null;
         this.internalClassName = BytecodeHelper.getClassInternalName(cn);