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

IC mangling: Write version 1.4.30 requirement to functions with new mangling

Browse Source
This commit is contained in:
Ilmir Usmanov
2020-11-11 10:12:13 +01:00
parent 2829d37cf5
commit 20e7a77b78
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+12 -1
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.resolve.constants.EnumValue
import org.jetbrains.kotlin.resolve.constants.IntValue import org.jetbrains.kotlin.resolve.constants.IntValue
import org.jetbrains.kotlin.resolve.constants.NullValue import org.jetbrains.kotlin.resolve.constants.NullValue
import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.resolve.constants.StringValue
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.descriptorUtil.nonSourceAnnotations import org.jetbrains.kotlin.resolve.descriptorUtil.nonSourceAnnotations
import org.jetbrains.kotlin.resolve.isInlineClassType import org.jetbrains.kotlin.resolve.isInlineClassType
import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags
@@ -361,7 +362,17 @@ class DescriptorSerializer private constructor(
} }
if (descriptor.hasInlineClassTypesInSignature()) { if (descriptor.hasInlineClassTypesInSignature()) {
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.InlineClasses)) if (descriptor.fqNameSafe.startsWith(Name.identifier("kotlin"))) {
builder.addVersionRequirement(writeVersionRequirement(LanguageFeature.InlineClasses))
} else {
builder.addVersionRequirement(
writeVersionRequirement(
1, 4, 30,
ProtoBuf.VersionRequirement.VersionKind.COMPILER_VERSION,
this
)
)
}
} }
} }