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

Support multiple version requirements on single element

Browse Source
This commit is contained in:
Alexander Udalov
2018-07-19 15:11:30 +02:00
parent b7df36643b
commit c011bf61fe
22 changed files with 1681 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+2 -3
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.builtins.isSuspendFunctionTypeOrSubtype
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget
@@ -138,7 +137,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
}
private fun DeserializedMemberDescriptor.versionAndReleaseCoroutinesMismatch(): Boolean =
c.components.configuration.releaseCoroutines && versionRequirement?.version != VersionRequirement.Version(1, 3)
c.components.configuration.releaseCoroutines && versionRequirements.none { it.version == VersionRequirement.Version(1, 3) }
private fun loadOldFlags(oldFlags: Int): Int {
val lowSixBits = oldFlags and 0x3f
@@ -231,7 +230,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
descriptor.isExperimentalCoroutineInReleaseEnvironment = local.typeDeserializer.experimentalSuspendFunctionTypeEncountered ||
((c.containingDeclaration as? DeserializedClassDescriptor)?.c?.typeDeserializer?.experimentalSuspendFunctionTypeEncountered == true &&
c.components.configuration.releaseCoroutines &&
descriptor.versionRequirement?.version != VersionRequirement.Version(1, 3))
descriptor.versionRequirements.none { it.version == VersionRequirement.Version(1, 3) })
return descriptor
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+1 -1
View File
@@ -66,7 +66,7 @@ class DeserializedClassDescriptor(
(containingDeclaration as? DeserializedClassDescriptor)?.thisAsProtoContainer
)
val versionRequirement: VersionRequirement?
val versionRequirements: List<VersionRequirement>
get() = VersionRequirement.create(classProto, c.nameResolver, c.versionRequirementTable)
override val annotations =
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
+1 -1
View File
@@ -27,7 +27,7 @@ interface DeserializedMemberDescriptor : MemberDescriptor {
val versionRequirementTable: VersionRequirementTable
val versionRequirement: VersionRequirement?
val versionRequirements: List<VersionRequirement>
get() = VersionRequirement.create(proto, nameResolver, versionRequirementTable)
// Information about the origin of this callable's container (class or package part on JVM) or null if there's no such information.
core/metadata/src/metadata.proto
+5 -5
View File
@@ -220,7 +220,7 @@ message Class {
optional TypeTable type_table = 30;
// Index into the VersionRequirementTable
optional int32 version_requirement = 31;
repeated int32 version_requirement = 31;
optional VersionRequirementTable version_requirement_table = 32;
@@ -258,7 +258,7 @@ message Constructor {
repeated ValueParameter value_parameter = 2;
// Index into the VersionRequirementTable
optional int32 version_requirement = 31;
repeated int32 version_requirement = 31;
extensions 100 to 18999;
}
@@ -295,7 +295,7 @@ message Function {
optional TypeTable type_table = 30;
// Index into the VersionRequirementTable
optional int32 version_requirement = 31;
repeated int32 version_requirement = 31;
optional Contract contract = 32;
@@ -349,7 +349,7 @@ message Property {
optional int32 setter_flags = 8;
// Index into the VersionRequirementTable
optional int32 version_requirement = 31;
repeated int32 version_requirement = 31;
extensions 100 to 18999;
}
@@ -394,7 +394,7 @@ message TypeAlias {
repeated Annotation annotation = 8;
// Index into the VersionRequirementTable
optional int32 version_requirement = 31;
repeated int32 version_requirement = 31;
extensions 100 to 199;
}
core/metadata/src/org/jetbrains/kotlin/metadata/ProtoBuf.java
+712 -227
View File
File diff suppressed because it is too large Load Diff
core/metadata/src/org/jetbrains/kotlin/metadata/deserialization/VersionRequirement.kt
+11 -7
View File
@@ -81,16 +81,20 @@ class VersionRequirement(
"since $version $level" + (if (errorCode != null) " error $errorCode" else "") + (if (message != null) ": $message" else "")
companion object {
fun create(proto: MessageLite, nameResolver: NameResolver, table: VersionRequirementTable): VersionRequirement? {
val id = when (proto) {
is ProtoBuf.Class -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
is ProtoBuf.Constructor -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
is ProtoBuf.Function -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
is ProtoBuf.Property -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
is ProtoBuf.TypeAlias -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
fun create(proto: MessageLite, nameResolver: NameResolver, table: VersionRequirementTable): List<VersionRequirement> {
val ids = when (proto) {
is ProtoBuf.Class -> proto.versionRequirementList
is ProtoBuf.Constructor -> proto.versionRequirementList
is ProtoBuf.Function -> proto.versionRequirementList
is ProtoBuf.Property -> proto.versionRequirementList
is ProtoBuf.TypeAlias -> proto.versionRequirementList
else -> throw IllegalStateException("Unexpected declaration: ${proto::class.java}")
}
return ids.mapNotNull { id -> create(id, nameResolver, table) }
}
fun create(id: Int, nameResolver: NameResolver, table: VersionRequirementTable): VersionRequirement? {
val info = table[id] ?: return null
val version = Version.decode(