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

Annotate with @UnsafeVariance relevant types in built-ins

Browse Source
This commit is contained in:
Denis Zharkov
2016-05-16 17:24:20 +03:00
parent 279ff0b561
commit 46ac26147b
9 changed files with 144 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/builtin-classes/java8/kotlin-collections.txt
Vendored
+7 -7
View File
@@ -32,9 +32,9 @@ public interface Collection</*0*/ out E> : kotlin.collections.Iterable<E> {
public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.Consumer<in E!>!): kotlin.Unit
public abstract fun isEmpty(): kotlin.Boolean
public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
public open fun parallelStream(): java.util.stream.Stream<E!>!
public open override /*1*/ fun spliterator(): java.util.Spliterator<E!>!
public open fun stream(): java.util.stream.Stream<E!>!
public open fun parallelStream(): java.util.stream.Stream<@kotlin.UnsafeVariance() E!>!
public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() E!>!
public open fun stream(): java.util.stream.Stream<@kotlin.UnsafeVariance() E!>!
}
public abstract class DoubleIterator : kotlin.collections.Iterator<kotlin.Double> {
@@ -64,7 +64,7 @@ public abstract class IntIterator : kotlin.collections.Iterator<kotlin.Int> {
public interface Iterable</*0*/ out T> {
public open fun forEach(/*0*/ p0: java.util.function.Consumer<in T!>!): kotlin.Unit
public abstract operator fun iterator(): kotlin.collections.Iterator<T>
public open fun spliterator(): java.util.Spliterator<T!>!
public open fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() T!>!
}
public interface Iterator</*0*/ out T> {
@@ -87,7 +87,7 @@ public interface List</*0*/ out E> : kotlin.collections.Collection<E> {
public abstract fun listIterator(): kotlin.collections.ListIterator<E>
public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<E>
public open override /*1*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream<E!>!
public open override /*1*/ fun spliterator(): java.util.Spliterator<E!>!
public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() E!>!
public open override /*1*/ /*fake_override*/ fun stream(): java.util.stream.Stream<E!>!
public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<E>
}
@@ -123,7 +123,7 @@ public interface Map</*0*/ K, /*1*/ out V> {
public abstract fun containsValue(/*0*/ value: @kotlin.UnsafeVariance() V): kotlin.Boolean
public open fun forEach(/*0*/ p0: java.util.function.BiConsumer<in K!, in V!>!): kotlin.Unit
public abstract operator fun get(/*0*/ key: K): V?
public open fun getOrDefault(/*0*/ p0: kotlin.Any!, /*1*/ p1: V!): V!
public open fun getOrDefault(/*0*/ p0: kotlin.Any!, /*1*/ p1: @kotlin.UnsafeVariance() V!): V!
public abstract fun isEmpty(): kotlin.Boolean
public interface Entry</*0*/ out K, /*1*/ out V> {
@@ -279,7 +279,7 @@ public interface Set</*0*/ out E> : kotlin.collections.Collection<E> {
public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
public open override /*1*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream<E!>!
public open override /*1*/ fun spliterator(): java.util.Spliterator<E!>!
public open override /*1*/ fun spliterator(): java.util.Spliterator<@kotlin.UnsafeVariance() E!>!
public open override /*1*/ /*fake_override*/ fun stream(): java.util.stream.Stream<E!>!
}
compiler/testData/builtin-classes/newMethods/kotlin-collections.txt
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ public interface Collection</*0*/ out E> : kotlin.collections.Iterable<E> {
public abstract fun containsAll(/*0*/ elements: kotlin.collections.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
public abstract fun isEmpty(): kotlin.Boolean
public abstract override /*1*/ fun iterator(): kotlin.collections.Iterator<E>
@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public abstract fun nonExistingMethod(/*0*/ p0: E!): kotlin.String!
@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public abstract fun nonExistingMethod(/*0*/ p0: @kotlin.UnsafeVariance() E!): kotlin.String!
}
public abstract class DoubleIterator : kotlin.collections.Iterator<kotlin.Double> {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt
+12 -6
View File
@@ -20,7 +20,9 @@ import org.jetbrains.kotlin.builtins.BuiltInsInitializer
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl
import org.jetbrains.kotlin.descriptors.annotations.composeAnnotations
import org.jetbrains.kotlin.descriptors.annotations.createDeprecatedAnnotation
import org.jetbrains.kotlin.descriptors.annotations.createUnsafeVarianceAnnotation
import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
@@ -43,8 +45,8 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
import org.jetbrains.kotlin.storage.LockBasedStorageManager
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.types.DelegatingType
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
import org.jetbrains.kotlin.utils.DFS
import org.jetbrains.kotlin.utils.SmartSet
import org.jetbrains.kotlin.utils.addToStdlib.check
@@ -104,13 +106,17 @@ open class JvmBuiltInsSettings(
}
.mapNotNull {
additionalMember ->
additionalMember.newCopyBuilder().apply {
val substitutedWithKotlinTypeParameters =
additionalMember.substitute(
createMappedTypeParametersSubstitution
(additionalMember.containingDeclaration as ClassDescriptor, classDescriptor).buildSubstitutor()
) as SimpleFunctionDescriptor
substitutedWithKotlinTypeParameters.newCopyBuilder().apply {
setOwner(classDescriptor)
setDispatchReceiverParameter(classDescriptor.thisAsReceiverParameter)
setPreserveSourceElement()
setSubstitution(createMappedTypeParametersSubstitution(
additionalMember.containingDeclaration as ClassDescriptor, classDescriptor))
setSubstitution(UnsafeVarianceTypeSubstitution(moduleDescriptor.builtIns))
val memberStatus = additionalMember.getJdkMethodStatus()
when (memberStatus) {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/UnsafeVarianceTypeSubstitution.kt
+97
View File
@@ -0,0 +1,97 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.load.kotlin
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl
import org.jetbrains.kotlin.descriptors.annotations.composeAnnotations
import org.jetbrains.kotlin.descriptors.annotations.createUnsafeVarianceAnnotation
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
internal class UnsafeVarianceTypeSubstitution(kotlinBuiltIns: KotlinBuiltIns) : TypeSubstitution() {
private val unsafeVarianceAnnotations = AnnotationsImpl(listOf(kotlinBuiltIns.createUnsafeVarianceAnnotation()))
override fun get(key: KotlinType) = null
override fun prepareTopLevelType(topLevelType: KotlinType, position: Variance): KotlinType {
val unsafeVariancePaths = mutableListOf<List<Int>>()
IndexedTypeHolder(topLevelType).checkTypePosition(
position,
{ typeParameter, indexedTypeHolder, errorPosition ->
unsafeVariancePaths.add(indexedTypeHolder.argumentIndices)
},
customVariance = { null })
return topLevelType.annotatePartsWithUnsafeVariance(unsafeVariancePaths)
}
private fun KotlinType.annotatePartsWithUnsafeVariance(unsafeVariancePaths: Collection<List<Int>>): KotlinType {
if (unsafeVariancePaths.isEmpty()) return this
if (isFlexible()) {
return flexibility().factory.create(
lowerIfFlexible().annotatePartsWithUnsafeVariance(subPathsWithIndex(unsafeVariancePaths, 0)),
upperIfFlexible().annotatePartsWithUnsafeVariance(subPathsWithIndex(unsafeVariancePaths, 1))
)
}
// if root is unsafe
if (emptyList<Int>() in unsafeVariancePaths) {
return replaceAnnotations(composeAnnotations(annotations, unsafeVarianceAnnotations))
}
return replace(newArguments = arguments.withIndex().map {
val (index, argument) = it
if (argument.isStarProjection) return@map argument
TypeProjectionImpl(
argument.projectionKind,
argument.type.annotatePartsWithUnsafeVariance(subPathsWithIndex(unsafeVariancePaths, index)))
})
}
private fun subPathsWithIndex(paths: Collection<List<Int>>, index: Int) = paths.filter { it[0] == index }.map { it.subList(1, it.size) }
private class IndexedTypeHolder(
override val type: KotlinType,
val argumentIndices: List<Int> = emptyList()
) : TypeHolder<IndexedTypeHolder> {
override val flexibleBounds: Pair<IndexedTypeHolder, IndexedTypeHolder>? get() =
if (type.isFlexible())
Pair(
IndexedTypeHolder(type.lowerIfFlexible(), argumentIndices + 0),
IndexedTypeHolder(type.upperIfFlexible(), argumentIndices + 1))
else null
override val arguments: List<TypeHolderArgument<IndexedTypeHolder>>
get() = type.arguments.withIndex().map { projectionWithIndex ->
val (index, projection) = projectionWithIndex
object : TypeHolderArgument<IndexedTypeHolder> {
override val projection: TypeProjection
get() = projection
override val typeParameter: TypeParameterDescriptor?
get() = type.constructor.parameters[index]
override val holder: IndexedTypeHolder
get() = IndexedTypeHolder(projection.type, argumentIndices + index)
}
}
}
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
+8
View File
@@ -57,4 +57,12 @@ fun KotlinBuiltIns.createDeprecatedAnnotation(
SourceElement.NO_SOURCE)
}
fun KotlinBuiltIns.createUnsafeVarianceAnnotation(): AnnotationDescriptor {
val unsafeVarianceAnnotation = getBuiltInClassByFqName(KotlinBuiltIns.FQ_NAMES.unsafeVariance)
return AnnotationDescriptorImpl(
unsafeVarianceAnnotation.defaultType,
emptyMap(),
SourceElement.NO_SOURCE)
}
private operator fun Collection<ValueParameterDescriptor>.get(parameterName: String) = single { it.name.asString() == parameterName }
core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt
+2
View File
@@ -32,6 +32,8 @@ class DisjointKeysUnionTypeSubstitution private constructor(
}
override fun get(key: KotlinType) = first[key] ?: second[key]
override fun prepareTopLevelType(topLevelType: KotlinType, position: Variance) =
second.prepareTopLevelType(first.prepareTopLevelType(topLevelType, position), position)
override fun isEmpty() = false
core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
+8 -1
View File
@@ -31,6 +31,9 @@ abstract class TypeSubstitution {
abstract operator fun get(key: KotlinType): TypeProjection?
// This can be used to perform preliminary manipulations with top-level types
open fun prepareTopLevelType(topLevelType: KotlinType, position: Variance): KotlinType = topLevelType
open fun isEmpty(): Boolean = false
open fun approximateCapturedTypes(): Boolean = false
@@ -170,6 +173,9 @@ private class CompositeTypeSubstitution(
return second.buildSubstitutor().substitute(firstResult)
}
override fun prepareTopLevelType(topLevelType: KotlinType, position: Variance) =
second.prepareTopLevelType(first.prepareTopLevelType(topLevelType, position), position)
override fun isEmpty() = first.isEmpty() && second.isEmpty()
override fun approximateCapturedTypes() = first.approximateCapturedTypes() || second.approximateCapturedTypes()
@@ -179,7 +185,8 @@ private class CompositeTypeSubstitution(
}
open class DelegatedTypeSubstitution(val substitution: TypeSubstitution): TypeSubstitution() {
override fun get(key: KotlinType) = substitution.get(key)
override fun get(key: KotlinType) = substitution[key]
override fun prepareTopLevelType(topLevelType: KotlinType, position: Variance) = substitution.prepareTopLevelType(topLevelType, position)
override fun isEmpty() = substitution.isEmpty()
core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java
+2 -1
View File
@@ -97,7 +97,8 @@ public class TypeSubstitutor {
@Nullable
public KotlinType substitute(@NotNull KotlinType type, @NotNull Variance howThisTypeIsUsed) {
TypeProjection projection = substitute(new TypeProjectionImpl(howThisTypeIsUsed, type));
TypeProjection projection =
substitute(new TypeProjectionImpl(howThisTypeIsUsed, getSubstitution().prepareTopLevelType(type, howThisTypeIsUsed)));
return projection == null ? null : projection.getType();
}
core/descriptors/src/org/jetbrains/kotlin/types/VarianceChecker.kt
+7
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.utils.DO_NOTHING_3
interface TypeHolder<out D : TypeHolder<D>> {
val type: KotlinType
val arguments: List<TypeHolderArgument<D>?>
val flexibleBounds: Pair<D, D>? get() = null
}
interface TypeHolderArgument<out D : TypeHolder<D>> {
@@ -37,6 +38,12 @@ fun <D : TypeHolder<D>> D.checkTypePosition(
reportError: (TypeParameterDescriptor, D, Variance) -> Unit = DO_NOTHING_3,
customVariance: (TypeParameterDescriptor) -> Variance? = { null }
): Boolean {
flexibleBounds?.let {
return it.first.checkTypePosition(position, reportError, customVariance) and
it.second.checkTypePosition(position, reportError, customVariance)
}
val classifierDescriptor = type.constructor.declarationDescriptor
if (classifierDescriptor is TypeParameterDescriptor) {
val declarationVariance = customVariance(classifierDescriptor) ?: classifierDescriptor.variance