azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Jspecify] Substitute enhancement of type instead of type itself directly

Browse Source
This commit is contained in:
Victor Petukhov
2021-05-12 19:17:34 +03:00
parent 2479655708
commit 12f6146bdf
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt
+3 -2
View File
@@ -54,8 +54,9 @@ interface NewTypeSubstitutor : TypeSubstitutorMarker {
} else { } else {
val lowerBound = substitute(type.lowerBound, keepAnnotation, runCapturedChecks) val lowerBound = substitute(type.lowerBound, keepAnnotation, runCapturedChecks)
val upperBound = substitute(type.upperBound, keepAnnotation, runCapturedChecks) val upperBound = substitute(type.upperBound, keepAnnotation, runCapturedChecks)
val enhancement = val enhancement = if (type is TypeWithEnhancement) {
if (type is TypeWithEnhancement) substituteTypeEnhancement(type, keepAnnotation, runCapturedChecks) else null substituteTypeEnhancement(type.enhancement, keepAnnotation, runCapturedChecks)
} else null
if (lowerBound == null && upperBound == null) { if (lowerBound == null && upperBound == null) {
null null
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt
Vendored
+2 -2
View File
@@ -18,8 +18,8 @@ fun <T : Test> main(a1: NonPlatformTypeParameter<Any?>, a2: NonPlatformTypeParam
a1.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>) a1.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
a1.bar<T>(x) a1.bar<T>(x)
// jspecify_nullness_mismatch{mute} // jspecify_nullness_mismatch
a2.foo(null) a2.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
a2.bar<Test?>(null) a2.bar<Test?>(null)
// jspecify_nullness_mismatch // jspecify_nullness_mismatch
a2.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>) a2.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt
Vendored
+2 -2
View File
@@ -18,8 +18,8 @@ fun <T : Test> main(a1: NonPlatformTypeParameter<Any?>, a2: NonPlatformTypeParam
a1.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>) a1.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
a1.bar<T>(x) a1.bar<T>(x)
// jspecify_nullness_mismatch{mute} // jspecify_nullness_mismatch
a2.foo(null) a2.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
a2.bar<Test?>(null) a2.bar<Test?>(null)
// jspecify_nullness_mismatch // jspecify_nullness_mismatch
a2.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>) a2.bar<T>(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)