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

Minor: move "is box/unbox method" to InlineClassDescriptorResolver

Browse Source
This commit is contained in:
Dmitry Petrov
2018-09-05 15:01:53 +03:00
parent d24b0fd3b2
commit c86ee90bec
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/inlineClassManglingUtils.kt
+2 -7
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.load.kotlin.getRepresentativeUpperBound
import org.jetbrains.kotlin.resolve.DescriptorUtils.RESULT_FQ_NAME
import org.jetbrains.kotlin.resolve.DescriptorUtils.SUCCESS_OR_FAILURE_FQ_NAME
import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver.BOX_METHOD_NAME
import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.isInlineClassType
@@ -19,7 +19,7 @@ import java.security.MessageDigest
fun getInlineClassValueParametersManglingSuffix(descriptor: CallableMemberDescriptor): String? {
if (descriptor !is FunctionDescriptor) return null
if (descriptor is ConstructorDescriptor) return null
if (descriptor.isSynthesizedBoxMethod()) return null
if (InlineClassDescriptorResolver.isSynthesizedBoxMethod(descriptor)) return null
val actualValueParameterTypes = listOfNotNull(descriptor.extensionReceiverParameter?.type) + descriptor.valueParameters.map { it.type }
@@ -42,11 +42,6 @@ private fun KotlinType.isTypeParameterWithUpperBoundThatRequiresMangling(): Bool
return getRepresentativeUpperBound(descriptor).requiresFunctionNameMangling()
}
private fun FunctionDescriptor.isSynthesizedBoxMethod() =
kind == CallableMemberDescriptor.Kind.SYNTHESIZED &&
containingDeclaration.let { it is ClassDescriptor && it.isInline } &&
name == BOX_METHOD_NAME
private fun collectSignatureForMangling(types: List<KotlinType>) =
types.joinToString { getSignatureElementForMangling(it) }