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

Don't throw an exception while loading type use annotations on implicit bounds of a wildcard

Browse Source 
^KT-45067 Fixed
This commit is contained in:
Victor Petukhov
2021-02-24 16:29:12 +03:00
parent 7669d8ff26
commit 26a96a1c19
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt
+4 -3
View File
@@ -174,7 +174,7 @@ class BinaryJavaAnnotation private constructor(
} }
internal fun computeTargetType(baseType: JavaType, typePath: TypePath) = internal fun computeTargetType(baseType: JavaType, typePath: TypePath) =
translatePath(typePath).fold(baseType) { targetType, (typePathKind, typeArgumentIndex) -> translatePath(typePath).fold<Pair<Int, Int>, JavaType?>(baseType) { targetType, (typePathKind, typeArgumentIndex) ->
when (typePathKind) { when (typePathKind) {
TypePath.TYPE_ARGUMENT -> { TypePath.TYPE_ARGUMENT -> {
require(targetType is JavaClassifierType) require(targetType is JavaClassifierType)
@@ -182,10 +182,11 @@ class BinaryJavaAnnotation private constructor(
?: throw IllegalArgumentException("There must be no less than ${typeArgumentIndex + 1} type arguments") ?: throw IllegalArgumentException("There must be no less than ${typeArgumentIndex + 1} type arguments")
} }
TypePath.WILDCARD_BOUND -> { TypePath.WILDCARD_BOUND -> {
// TODO: think about processing annotated wildcards themselves
require(targetType is JavaWildcardType) require(targetType is JavaWildcardType)
// below, returned `null` means annotated implicit lower and upper wildcard's bound,
// it isn't supported yet to load type use annotations (null is further ignored)
// TODO: consider taking into account such annotations through returning wildcard itself as a target type (KT-40498)
targetType.bound targetType.bound
?: throw IllegalArgumentException("Wildcard mast have a bound for annotation of WILDCARD_BOUND position")
} }
TypePath.ARRAY_ELEMENT -> { TypePath.ARRAY_ELEMENT -> {
require(targetType is JavaArrayType) require(targetType is JavaArrayType)