This is an automated email from the ASF dual-hosted git repository.
daniellansun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new f8cd5fc59d GROOVY-12022: replace indy code for array access in static
compilation (#2546)
f8cd5fc59d is described below
commit f8cd5fc59d034c2bb8b409fa06017834032ef894
Author: Jochen Theodorou <[email protected]>
AuthorDate: Tue May 26 22:16:24 2026 +0200
GROOVY-12022: replace indy code for array access in static compilation
(#2546)
* GROOVY-12022: replace indy code for array access in static compilation
mode with existing code in BytecodeInterface8 and deprecate now surplus
IndyStaticTypesMultiTypeDispatcher. Performance wise there is no gain to use
indy here and it simplifies code paths and JIT work
* GROOVY-12022: fixing tests, since BytecodeInterface8 is now used, the old
invokedynamic instruction is no longer valid
* Applying suggested GroovyDoc fix from Co-Pilot
Co-authored-by: Copilot Autofix powered by AI
<[email protected]>
---------
Co-authored-by: Copilot Autofix powered by AI
<[email protected]>
---
.../sc/IndyStaticTypesMultiTypeDispatcher.java | 3 ++
.../asm/sc/StaticTypesWriterController.java | 8 +---
.../sc/CombinedIndyAndStaticCompilationTest.groovy | 54 +++++++++++++++++-----
.../classgen/asm/sc/StaticCompilationTest.groovy | 6 +--
4 files changed, 47 insertions(+), 24 deletions(-)
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 d58f253a20..78a2cb7b4c 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
@@ -36,7 +36,10 @@ import static org.objectweb.asm.Opcodes.H_INVOKESTATIC;
* Multi type dispatcher for binary expression backend combining indy and
static compilation
*
* @since 2.5.0
+ * @deprecated Since 6.0.0, use {@link
StaticTypesBinaryExpressionMultiTypeDispatcher} instead;
+ * indy array access is no longer used in static compilation.
*/
+@Deprecated(since = "6.0.0")
public class IndyStaticTypesMultiTypeDispatcher extends
StaticTypesBinaryExpressionMultiTypeDispatcher {
/**
* Creates a dispatcher that combines static compilation and indy array
access.
diff --git
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
index 5ec8a558b9..4878fbdf11 100644
---
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
+++
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
@@ -42,8 +42,6 @@ import org.codehaus.groovy.classgen.asm.StatementWriter;
import org.codehaus.groovy.classgen.asm.TypeChooser;
import org.codehaus.groovy.classgen.asm.UnaryExpressionHelper;
import org.codehaus.groovy.classgen.asm.WriterController;
-import
org.codehaus.groovy.classgen.asm.indy.sc.IndyStaticTypesMultiTypeDispatcher;
-import org.codehaus.groovy.control.CompilerConfiguration;
import org.objectweb.asm.ClassVisitor;
import static
org.codehaus.groovy.transform.sc.StaticCompilationVisitor.isStaticallyCompiled;
@@ -91,11 +89,7 @@ public class StaticTypesWriterController extends
DelegatingController {
this.lambdaWriter = new StaticTypesLambdaWriter(this);
this.methodReferenceExpressionWriter = new
StaticTypesMethodReferenceExpressionWriter(this);
this.unaryExpressionHelper = new
StaticTypesUnaryExpressionHelper(this);
-
- CompilerConfiguration config = cn.getCompileUnit().getConfig();
- this.binaryExpressionHelper = config.isIndyEnabled()
- ? new IndyStaticTypesMultiTypeDispatcher(this)
- : new StaticTypesBinaryExpressionMultiTypeDispatcher(this);
+ this.binaryExpressionHelper = new
StaticTypesBinaryExpressionMultiTypeDispatcher(this);
}
/** {@inheritDoc} */
diff --git
a/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/CombinedIndyAndStaticCompilationTest.groovy
b/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/CombinedIndyAndStaticCompilationTest.groovy
index ffdc43183b..0b7a6985ab 100644
---
a/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/CombinedIndyAndStaticCompilationTest.groovy
+++
b/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/CombinedIndyAndStaticCompilationTest.groovy
@@ -21,6 +21,7 @@ package org.codehaus.groovy.classgen.asm.sc
import org.codehaus.groovy.classgen.asm.AbstractBytecodeTestCase
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
import org.junit.jupiter.params.provider.ValueSource
import static org.codehaus.groovy.control.CompilerConfiguration.DEFAULT as
config
@@ -32,41 +33,59 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue
final class CombinedIndyAndStaticCompilationTest extends
AbstractBytecodeTestCase {
@ParameterizedTest
-
@ValueSource(strings=['byte','short','int','long','float','double','boolean','char'])
- void testArrayRead(String type) {
+ @CsvSource([
+ 'byte, bArray, B',
+ 'short, sArray, S',
+ 'int, intArray, I',
+ 'long, lArray, J',
+ 'float, fArray, F',
+ 'double, dArray, D',
+ 'boolean, zArray, Z',
+ 'char, cArray, C',
+ 'Object, objectArray, Ljava/lang/Object;'])
+ void testArrayRead(String typeSource, String namePart, String
typeByteCode) {
assumeTrue config.indyEnabled
def bytecode = compile method:'test', """
@groovy.transform.CompileStatic
void test() {
- ${type}[] array = new ${type}[10]
- ${type} x = array[0]
+ ${typeSource}[] array = new ${typeSource}[10]
+ ${typeSource} x = array[0]
}
"""
int offset = bytecode.indexOf('--BEGIN--') + 4
- assert bytecode.indexOf('INVOKEDYNAMIC', offset) > offset
- assert bytecode.indexOf('INVOKEDYNAMIC', offset) <
bytecode.indexOf('--END--')
+ assert bytecode.indexOf(createGetter(typeByteCode, namePart), offset)
> offset
+ assert bytecode.indexOf(createGetter(typeByteCode, namePart), offset)
< bytecode.indexOf('--END--')
}
@ParameterizedTest
-
@ValueSource(strings=['byte','short','int','long','float','double','boolean','char'])
- void testArrayWrite(String type) {
+ @CsvSource([
+ 'byte, bArray, B',
+ 'short, sArray, S',
+ 'int, intArray, I',
+ 'long, lArray, J',
+ 'float, fArray, F',
+ 'double, dArray, D',
+ 'boolean, zArray, Z',
+ 'char, cArray, C',
+ 'Object, objectArray, Ljava/lang/Object;'])
+ void testArrayWrite(String typeSource, String namePart, String
typeByteCode) {
assumeTrue config.indyEnabled
def bytecode = compile method:'test', """
@groovy.transform.CompileStatic
void test() {
- ${type}[] array = new ${type}[10]
+ ${typeSource}[] array = new ${typeSource}[10]
array[0] = 1
}
"""
int offset = bytecode.indexOf('--BEGIN--') + 4
- assert bytecode.indexOf('INVOKEDYNAMIC', offset) > offset
- assert bytecode.indexOf('INVOKEDYNAMIC', offset) <
bytecode.indexOf('--END--')
+ assert bytecode.indexOf(createSetter(typeByteCode, namePart), offset)
> offset
+ assert bytecode.indexOf(createSetter(typeByteCode, namePart), offset)
< bytecode.indexOf('--END--')
}
@ParameterizedTest
- @ValueSource(strings=['byte','short','int','long','float','double','char'])
+
@ValueSource(strings=['byte','short','int','long','float','double','char','Object'])
void testNegativeIndex(String type) {
assertScript """
@groovy.transform.CompileStatic
@@ -149,4 +168,15 @@ final class CombinedIndyAndStaticCompilationTest extends
AbstractBytecodeTestCas
assert bytecode.indexOf('INVOKESTATIC ', offset) > offset
assert bytecode.indexOf('INVOKESTATIC ', offset) <
bytecode.indexOf('RETURN', offset)
}
+
+ private String createSetter(String typeByteCode, String namePart) {
+ return "INVOKESTATIC org/codehaus/groovy/runtime/BytecodeInterface8." +
+ namePart + "Set ([" + typeByteCode + "I" + typeByteCode + ")V"
+ }
+
+ private String createGetter(String typeByteCode, String namePart) {
+ return "INVOKESTATIC org/codehaus/groovy/runtime/BytecodeInterface8." +
+ namePart + "Get ([" + typeByteCode + "I)" + typeByteCode
+
+ }
}
diff --git
a/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
b/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
index bea51d253c..f2450f94b3 100644
---
a/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
+++
b/src/test/groovy/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
@@ -266,11 +266,7 @@ final class StaticCompilationTest extends
AbstractBytecodeTestCase {
'ALOAD 1',
'ICONST_0',
'ILOAD 2',
- 'INVOKEDYNAMIC set([III)V [',
- '// handle kind 0x6 : INVOKESTATIC',
-
'org/codehaus/groovy/vmplugin/v8/IndyInterface.staticArrayAccess',
- '// arguments: none',
- ']',
+ 'INVOKESTATIC
org/codehaus/groovy/runtime/BytecodeInterface8.intArraySet ([III)V',
'L1',
'LINENUMBER 4',
'RETURN'
