diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java index a47cfdcc97f..3da59686bc9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java @@ -21,7 +21,6 @@ package org.jetbrains.kotlin.load.java.components; * This enum encodes the kinds of occurrences */ public enum TypeUsage { - MEMBER_SIGNATURE_CONTRAVARIANT, SUPERTYPE, COMMON } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt index 372bd351358..9f9218b92b2 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt @@ -168,7 +168,7 @@ abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : MemberS val (index, javaParameter) = pair val annotations = c.resolveAnnotations(javaParameter) - val typeUsage = LazyJavaTypeAttributes(TypeUsage.MEMBER_SIGNATURE_CONTRAVARIANT, annotations) + val typeUsage = LazyJavaTypeAttributes(TypeUsage.COMMON, annotations) val (outType, varargElementType) = if (javaParameter.isVararg) { val paramType = javaParameter.type as? JavaArrayType diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt index 5b87ab9da5b..c7cf3f12e5a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt @@ -25,7 +25,8 @@ import org.jetbrains.kotlin.load.java.ANNOTATIONS_COPIED_TO_TYPES import org.jetbrains.kotlin.load.java.JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION import org.jetbrains.kotlin.load.java.JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION import org.jetbrains.kotlin.load.java.components.TypeUsage -import org.jetbrains.kotlin.load.java.components.TypeUsage.* +import org.jetbrains.kotlin.load.java.components.TypeUsage.COMMON +import org.jetbrains.kotlin.load.java.components.TypeUsage.SUPERTYPE import org.jetbrains.kotlin.load.java.lazy.LazyJavaAnnotations import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext import org.jetbrains.kotlin.load.java.lazy.TypeParameterResolver @@ -82,7 +83,7 @@ class JavaTypeResolver( c.module.builtIns.getArrayType(OUT_VARIANCE, componentType).makeNullableAsSpecified(true)) } - val projectionKind = if (attr.howThisTypeIsUsed == MEMBER_SIGNATURE_CONTRAVARIANT || isVararg) OUT_VARIANCE else INVARIANT + val projectionKind = if (isVararg) OUT_VARIANCE else INVARIANT val result = c.module.builtIns.getArrayType(projectionKind, componentType) return@run result.makeNullableAsSpecified(!attr.isMarkedNotNull) }.replaceAnnotations(attr.typeAnnotations)