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

Refine 1.0-compatibility mode for JDK dependent members

Browse Source 
- calls must be prohibited iff they refer to some additonal built in member
- override must be prohibited iff all of the overridden descriptors are additional

Other usages were able to be successfully compiled by 1.0.x

Solution with @Deprecated(level=Error) doesn't work properly, because
deprecation propagates to overridden, thus call 'java.util.ArrayList<String>().stream()'
becomes invalid, while it was correct in 1.0.x

 #KT-15794 Fixed
This commit is contained in:
Denis Zharkov
2017-01-18 18:03:28 +03:00
parent b9f9894310
commit 5d4f51d9b6
4 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt
+8 -13
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.builtins.JvmBuiltInClassDescriptorFactory
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl
import org.jetbrains.kotlin.descriptors.annotations.createDeprecatedAnnotation
import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
@@ -81,10 +82,9 @@ open class JvmBuiltInsSettings(
).let { AnnotationsImpl(listOf(it)) }
}
private val notSupportedDeprecation by storageManager.createLazyValue {
// We use both LowPriorityInOverloadResolution to achieve the following goals:
// - If there is something to resolve to beside an additional built-in member, it's *almost* always will win
// - Otherwise error will be reported because of Deprecated annotation with Error level
private val lowPriorityAnnotation: Annotations by storageManager.createLazyValue {
// We use both LowPriorityInOverloadResolution to achieve the following goal:
// If there is something to resolve to beside an additional built-in member, it's *almost* always will win
val lowPriorityAnnotation =
ClassDescriptorImpl(
moduleDescriptor.getPackage(LOW_PRIORITY_IN_OVERLOAD_RESOLUTION_FQ_NAME.parent()), LOW_PRIORITY_IN_OVERLOAD_RESOLUTION_FQ_NAME.shortName(),
@@ -95,12 +95,7 @@ open class JvmBuiltInsSettings(
AnnotationDescriptorImpl(defaultType, emptyMap(), SourceElement.NO_SOURCE)
}
val errorDeprecation = moduleDescriptor.builtIns.createDeprecatedAnnotation(
"This member is not supported by Kotlin compiler on this language level",
level = DeprecationLevel.ERROR.name
)
AnnotationsImpl(listOf(lowPriorityAnnotation, errorDeprecation))
AnnotationsImpl(listOf(lowPriorityAnnotation))
}
private fun StorageManager.createMockJavaIoSerializableType(): KotlinType {
@@ -162,7 +157,7 @@ open class JvmBuiltInsSettings(
JDKMemberStatus.NOT_CONSIDERED -> {
if (!isAdditionalBuiltInsFeatureSupported) {
setAdditionalAnnotations(notSupportedDeprecation)
setAdditionalAnnotations(lowPriorityAnnotation)
}
else {
setAdditionalAnnotations(notConsideredDeprecation)
@@ -173,7 +168,7 @@ open class JvmBuiltInsSettings(
JDKMemberStatus.WHITE_LIST -> {
if (!isAdditionalBuiltInsFeatureSupported) {
setAdditionalAnnotations(notSupportedDeprecation)
setAdditionalAnnotations(lowPriorityAnnotation)
}
}
}
@@ -321,7 +316,7 @@ open class JvmBuiltInsSettings(
setSubstitution(substitutor.substitution)
if (!isAdditionalBuiltInsFeatureSupported) {
setAdditionalAnnotations(notSupportedDeprecation)
setAdditionalAnnotations(lowPriorityAnnotation)
}
else if (SignatureBuildingComponents.signature(javaAnalogueDescriptor, javaConstructor.computeJvmDescriptor()) !in WHITE_LIST_CONSTRUCTOR_SIGNATURES) {
setAdditionalAnnotations(notConsideredDeprecation)