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 2020/08/01 11:18:11 UTC
[groovy] branch GROOVY_3_0_X updated (c005209 -> 7d37b9f)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from c005209 GROOVY-9666: ConcurrentModificationException when processing ModuleNode imports (closes #1332)
new 0ef495d Trivial refactoring: extract common variable
new 7d37b9f Trivial refactoring: avoid using deprecated API
The 2 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:
.../groovy/classgen/asm/MethodCallerMultiAdapter.java | 16 +++++++++-------
.../groovy/classgen/asm/indy/InvokeDynamicWriter.java | 3 ++-
.../asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java | 3 ++-
3 files changed, 13 insertions(+), 9 deletions(-)
[groovy] 02/02: Trivial refactoring: avoid using deprecated API
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 7d37b9fb36862cd2dcf6b8cd985eb4ae621d21b9
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Aug 1 19:07:59 2020 +0800
Trivial refactoring: avoid using deprecated API
(cherry picked from commit 68471fc52c0f19e417e79f2f452c8abbabc12fa8)
---
.../org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java | 3 ++-
.../classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
index b5483cf..000dac6 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
@@ -73,7 +73,8 @@ public class InvokeDynamicWriter extends InvocationWriter {
H_INVOKESTATIC,
INDY_INTERFACE_NAME,
"bootstrap",
- BSM_METHOD_TYPE_DESCRIPTOR);
+ BSM_METHOD_TYPE_DESCRIPTOR,
+ false);
private final WriterController controller;
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java b/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java
index cd213ca..375155e 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java
@@ -51,7 +51,8 @@ public class IndyStaticTypesMultiTypeDispatcher extends StaticTypesBinaryExpress
H_INVOKESTATIC,
INDY_INTERFACE_NAME,
"staticArrayAccess",
- BSM_METHOD_TYPE_DESCRIPTOR);
+ BSM_METHOD_TYPE_DESCRIPTOR,
+ false);
private static class GenericArrayAccess extends MethodCaller {
private final String name, signature;
public GenericArrayAccess(String name, String signature) {
[groovy] 01/02: Trivial refactoring: extract common variable
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0ef495dfedab6b7846c0a1663da7242807c32fc5
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Aug 1 18:58:18 2020 +0800
Trivial refactoring: extract common variable
(cherry picked from commit 5224f2f4d6591d00c5325427a9ef649d288d7705)
---
.../groovy/classgen/asm/MethodCallerMultiAdapter.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java b/src/main/java/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java
index 608e737..d417bbe 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java
@@ -30,18 +30,20 @@ public class MethodCallerMultiAdapter {
MethodCallerMultiAdapter mcma = new MethodCallerMultiAdapter();
mcma.skipSpreadSafeAndSafe = skipSpreadSafeAndSafe;
if (createNArgs) {
- int numberOfBaseMethods = mcma.numberOfBaseMethods();
+ final int numberOfBaseMethods = mcma.numberOfBaseMethods();
mcma.methods = new MethodCaller[(MAX_ARGS + 2) * numberOfBaseMethods];
for (int i = 0; i <= MAX_ARGS; i++) {
- mcma.methods[i * numberOfBaseMethods] = MethodCaller.newStatic(theClass, baseName + i);
+ final int idx = i * numberOfBaseMethods;
+ mcma.methods[idx] = MethodCaller.newStatic(theClass, baseName + i);
if (skipSpreadSafeAndSafe) continue;
- mcma.methods[i * numberOfBaseMethods + 1] = MethodCaller.newStatic(theClass, baseName + i + "Safe");
- mcma.methods[i * numberOfBaseMethods + 2] = MethodCaller.newStatic(theClass, baseName + i + "SpreadSafe");
+ mcma.methods[idx + 1] = MethodCaller.newStatic(theClass, baseName + i + "Safe");
+ mcma.methods[idx + 2] = MethodCaller.newStatic(theClass, baseName + i + "SpreadSafe");
}
- mcma.methods[(MAX_ARGS + 1) * numberOfBaseMethods] = MethodCaller.newStatic(theClass, baseName + "N");
+ final int idx = (MAX_ARGS + 1) * numberOfBaseMethods;
+ mcma.methods[idx] = MethodCaller.newStatic(theClass, baseName + "N");
if (!skipSpreadSafeAndSafe) {
- mcma.methods[(MAX_ARGS + 1) * numberOfBaseMethods + 1] = MethodCaller.newStatic(theClass, baseName + "N" + "Safe");
- mcma.methods[(MAX_ARGS + 1) * numberOfBaseMethods + 2] = MethodCaller.newStatic(theClass, baseName + "N" + "SpreadSafe");
+ mcma.methods[idx + 1] = MethodCaller.newStatic(theClass, baseName + "N" + "Safe");
+ mcma.methods[idx + 2] = MethodCaller.newStatic(theClass, baseName + "N" + "SpreadSafe");
}
} else if (!skipSpreadSafeAndSafe) {