You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/05/17 19:44:44 UTC
[groovy] branch GROOVY_3_0_X updated: GROOVY-10624: STC: don't apply context generics for diamond ctor call
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 634627981d GROOVY-10624: STC: don't apply context generics for diamond ctor call
634627981d is described below
commit 634627981d28a3d46f73d544a1e506c6a6ce06ab
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue May 17 12:54:17 2022 -0500
GROOVY-10624: STC: don't apply context generics for diamond ctor call
---
.../transform/stc/StaticTypeCheckingVisitor.java | 3 ++-
.../groovy/transform/stc/GenericsSTCTest.groovy | 28 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index ca216361da..76f4c35b17 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -209,6 +209,7 @@ import static org.codehaus.groovy.ast.tools.WideningCategories.isLongCategory;
import static org.codehaus.groovy.ast.tools.WideningCategories.isNumberCategory;
import static org.codehaus.groovy.ast.tools.WideningCategories.lowestUpperBound;
import static org.codehaus.groovy.classgen.AsmClassGenerator.MINIMUM_BYTECODE_VERSION;
+import static org.codehaus.groovy.runtime.DefaultGroovyMethods.asBoolean;
import static org.codehaus.groovy.runtime.DefaultGroovyMethods.init;
import static org.codehaus.groovy.runtime.DefaultGroovyMethods.last;
import static org.codehaus.groovy.syntax.Types.ASSIGN;
@@ -2284,7 +2285,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
&& parameters.length == argumentTypes.length - 1) {
ctor = typeCheckMapConstructor(call, receiver, arguments);
} else {
- if (receiver.getGenericsTypes() != null) { // GROOVY-8961, GROOVY-9734, GROOVY-9915, GROOVY-10482, et al.
+ if (asBoolean(receiver.getGenericsTypes())) { // GROOVY-10283, GROOVY-10316, GROOVY-10482, GROOVY-10624, et al.
Map<GenericsTypeName, GenericsType> context = extractPlaceHolders(null, receiver, ctor.getDeclaringClass());
parameters = Arrays.stream(parameters).map(p -> new Parameter(applyGenericsContext(context, p.getType()), p.getName())).toArray(Parameter[]::new);
}
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index c593d72357..6b8b2d2e48 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -1236,6 +1236,34 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
+ @NotYetImplemented // GROOVY-10316
+ void testDiamondInferrenceFromConstructor28() {
+ assertScript '''
+ class A<T> {
+ A(T t) {
+ }
+ }
+ @groovy.transform.TupleConstructor(defaults=false)
+ class B<T> {
+ A<T> p
+ }
+ def b = new B<>(new A<>(1L))
+ A<Long> x = b.p // Cannot assign A<Object> to A<Long>
+ '''
+ }
+
+ // GROOVY-10624
+ void testDiamondInferrenceFromConstructor29() {
+ assertScript '''
+ class A<T> {
+ }
+ class B<T> {
+ B(A<T> a) { }
+ }
+ B<Float> x = new B<>(new A<>()) // Cannot assign B<Object> to B<Float>
+ '''
+ }
+
// GROOVY-10280
void testTypeArgumentPropagation() {
assertScript '''