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 2021/06/04 14:59:56 UTC
[groovy] branch master updated: GROOVY-10107: STC: check assign
null before type parameter compatibility
This is an automated email from the ASF dual-hosted git repository.
emilles 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 0bdad76 GROOVY-10107: STC: check assign null before type parameter compatibility
0bdad76 is described below
commit 0bdad7618fe12e8869cae710607a5056c400b6b6
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Jun 4 09:48:39 2021 -0500
GROOVY-10107: STC: check assign null before type parameter compatibility
---
.../groovy/transform/stc/StaticTypeCheckingSupport.java | 11 +++++------
src/test/groovy/transform/stc/GenericsSTCTest.groovy | 14 ++++++++++++++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index 1708cf3..1e8587d 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -662,6 +662,10 @@ public abstract class StaticTypeCheckingSupport {
* @see org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation#castToType(Object,Class)
*/
public static boolean checkCompatibleAssignmentTypes(final ClassNode left, final ClassNode right, final Expression rightExpression, final boolean allowConstructorCoercion) {
+ if (!isPrimitiveType(left) && isNullConstant(rightExpression)) {
+ return true;
+ }
+
// GROOVY-7307, GROOVY-9952, et al.
if (left.isGenericsPlaceHolder()) {
GenericsType[] genericsTypes = left.getGenericsTypes();
@@ -705,13 +709,8 @@ public abstract class StaticTypeCheckingSupport {
}
}
- boolean rightExpressionIsNull = isNullConstant(rightExpression);
- if (rightExpressionIsNull && !isPrimitiveType(left)) {
- return true;
- }
-
// anything can be assigned to an Object, String, [Bb]oolean or Class receiver; except null to boolean
- if (isWildcardLeftHandSide(left) && !(leftRedirect == boolean_TYPE && rightExpressionIsNull)) return true;
+ if (isWildcardLeftHandSide(left) && !(leftRedirect == boolean_TYPE && isNullConstant(rightExpression))) return true;
if (leftRedirect == char_TYPE && rightRedirect == Character_TYPE) return true;
if (leftRedirect == Character_TYPE && rightRedirect == char_TYPE) return true;
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index c02e904..2f8430d 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -1779,6 +1779,7 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
assertScript '''
Map<String, Integer> foo = null
Integer result = foo?.get('a')
+ assert result == null
'''
}
@@ -1786,6 +1787,7 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
assertScript '''
List<Integer> foo = null
Integer result = foo?.get(0)
+ assert result == null
'''
}
@@ -1794,8 +1796,20 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
List<Integer> foo = [1]
foo = null
Integer result = foo?.get(0)
+ assert result == null
'''
+ }
+ // GROOVY-10107
+ void testAssignNullTypeParameterWithUpperBounds() {
+ assertScript '''
+ class C<T extends Number> {
+ void m() {
+ T n = null
+ }
+ }
+ new C<Long>().m()
+ '''
}
void testMethodCallWithArgumentUsingNestedGenerics() {