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

inlineClassUtils: Fix handling of inline classes without constructors

Browse Source 
Fixes KT-50992

DeclarationDescriptor.isInlineClass misidentifies inline classes without
constructors. This can happen for the ABI of inline classes with private
constructors.
This commit is contained in:
Steven Schäfer
2022-01-27 14:08:43 +01:00
committed by Alexander Udalov
parent aa6ba18c39
commit 78d80181e2
7 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/inlineClassesUtils.kt
+1 -1
View File
@@ -22,7 +22,7 @@ val JVM_INLINE_ANNOTATION_CLASS_ID = ClassId.topLevel(JVM_INLINE_ANNOTATION_FQ_N
fun DeclarationDescriptor.isInlineClass(): Boolean = when {
this !is ClassDescriptor -> false
isInline -> true
else -> isValue && unsubstitutedPrimaryConstructor?.valueParameters?.size == 1
else -> isValue && unsubstitutedPrimaryConstructor?.valueParameters?.size?.let { it == 1 } ?: true
}
fun DeclarationDescriptor.isValueClass(): Boolean =
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+1 -1
View File
@@ -177,7 +177,7 @@ class DeserializedClassDescriptor(
override fun getInlineClassRepresentation(): InlineClassRepresentation<SimpleType>? = inlineClassRepresentation()
private fun computeInlineClassRepresentation(): InlineClassRepresentation<SimpleType>? {
if (!isInlineClass()) return null
if (!isInlineOrValueClass()) return null
val propertyName = when {
classProto.hasInlineClassUnderlyingPropertyName() ->