Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.List;

import static org.codehaus.groovy.classgen.AsmClassGenerator.containsSpreadExpression;
import static org.objectweb.asm.Opcodes.CHECKCAST;
import static org.objectweb.asm.Opcodes.DUP;
import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;

Expand Down Expand Up @@ -111,6 +112,16 @@ public void visit(final GroovyCodeVisitor visitor) {
var list = new ConstructorCallExpression(ArrayList_TYPE, new ConstantExpression(getExpressions().size(), true));
list.putNodeMetaData(StaticTypesMarker.DIRECT_METHOD_CALL_TARGET, ArrayList_NEW);
list.visit(visitor);
// GROOVY-11967: when the constructor goes through a dynamic call
// site (indy or non-indy), the call leaves Object on the JVM stack
// and the following INVOKEVIRTUAL ArrayList.add fails verification
// unless preceded by CHECKCAST. The direct INVOKESPECIAL path of
// StaticInvocationWriter already leaves ArrayList on the stack, so
// there the cast is unnecessary.
if (!ArrayList_TYPE.equals(os.getTopOperand())) {
mv.visitTypeInsn(CHECKCAST, "java/util/ArrayList");
Comment thread
paulk-asert marked this conversation as resolved.
os.replace(ArrayList_TYPE);
}

for (Expression li : getExpressions()) {
mv.visitInsn(DUP);
Expand Down
143 changes: 143 additions & 0 deletions src/test/groovy/bugs/Groovy11967.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package bugs

import org.codehaus.groovy.control.CompilerConfiguration
import org.junit.jupiter.api.Test

import static groovy.test.GroovyAssert.assertScript

/**
* Regression coverage for the synthesised lower-arity bridge constructor that
* {@code @CompileStatic} emits for a constructor with a default-valued list
* parameter. The bridge inlines the default {@code [...]} literal as a
* {@code new ArrayList(n)} followed by {@code .add(...)} calls; when the
* constructor goes through a dynamic call site (which happens in both indy
* and non-indy modes for this bridge) it returns {@code Object} on the JVM
* stack, so the {@code INVOKEVIRTUAL ArrayList.add} that follows must be
* preceded by a {@code CHECKCAST ArrayList} to satisfy the verifier.
*/
final class Groovy11967 {

@Test
void testDefaultListClassParam() {
assertScript '''
interface MessageSource {}
@groovy.transform.CompileStatic
class C {
List<Class> types
C(Class<?> a, MessageSource b, List<Class> targetTypes = [Object]) {
this.types = targetTypes
}
}
class FakeMs implements MessageSource {}

def c = new C(String, new FakeMs())
assert c.types == [Object]
'''
}

@Test
void testDefaultListStringParam() {
assertScript '''
@groovy.transform.CompileStatic
class C {
List<String> values
C(int x, List<String> values = ['hi']) { this.values = values }
}
assert new C(1).values == ['hi']
'''
}

@Test
void testDefaultListIntegerParam() {
assertScript '''
@groovy.transform.CompileStatic
class C {
List<Integer> values
C(int x, List<Integer> values = [1, 2, 3]) { this.values = values }
}
assert new C(1).values == [1, 2, 3]
'''
}

@Test
void testDefaultNestedListParam() {
assertScript '''
@groovy.transform.CompileStatic
class C {
List<List<String>> values
C(int x, List<List<String>> values = [['a'], ['b']]) { this.values = values }
}
assert new C(1).values == [['a'], ['b']]
'''
}

@Test
void testDefaultEmptyListParam() {
assertScript '''
@groovy.transform.CompileStatic
class C {
List<String> values
C(int x, List<String> values = []) { this.values = values }
}
assert new C(1).values == []
'''
}

@Test
void testDefaultListInMiddleParam() {
// exercises the bridge that drops *only* the trailing parameter,
// leaving the list-default in non-final position when the next
// bridge layer is generated.
assertScript '''
@groovy.transform.CompileStatic
class C {
List<String> values
String tag
C(int x, List<String> values = ['a'], String tag = 't') {
this.values = values
this.tag = tag
}
}
assert new C(1).values == ['a']
assert new C(1).tag == 't'
assert new C(1, ['b']).tag == 't'
'''
}

@Test
void testDefaultListClassParam_nonIndy() {
// The bridge constructor's `new ArrayList(n)` is dispatched through a
// dynamic call site even in non-indy mode, so the same CHECKCAST is
// required there.
CompilerConfiguration config = new CompilerConfiguration()
config.optimizationOptions.put('indy', false)
new GroovyShell(config).evaluate '''
@groovy.transform.CompileStatic
class C {
List<Class> types
C(Class<?> a, Object b, List<Class> targetTypes = [Object]) {
this.types = targetTypes
}
}
assert new C(String, "x").types == [Object]
'''
}
}
Loading