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

IC Mangling: Do not mangle functions with inline classes from Java

Browse Source 
in JVM_IR BE. Map types to boxed variants, when mapping signatures.
 #KT-26445
This commit is contained in:
Ilmir Usmanov
2020-12-10 13:00:59 +01:00
parent 0cab69a7a0
commit cbb8eb494a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt
+7 -2
View File
@@ -195,7 +195,8 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
// See also: KotlinTypeMapper.forceBoxedReturnType // See also: KotlinTypeMapper.forceBoxedReturnType
private fun forceBoxedReturnType(function: IrFunction): Boolean = private fun forceBoxedReturnType(function: IrFunction): Boolean =
isBoxMethodForInlineClass(function) || forceFoxedReturnTypeOnOverride(function) || forceBoxedReturnTypeOnDefaultImplFun(function) isBoxMethodForInlineClass(function) || forceFoxedReturnTypeOnOverride(function) || forceBoxedReturnTypeOnDefaultImplFun(function) ||
function.isFromJava() && function.returnType.isInlined()
private fun forceFoxedReturnTypeOnOverride(function: IrFunction) = private fun forceFoxedReturnTypeOnOverride(function: IrFunction) =
function is IrSimpleFunction && function is IrSimpleFunction &&
@@ -320,7 +321,11 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
private fun writeParameterType(sw: JvmSignatureWriter, type: IrType, declaration: IrDeclaration) { private fun writeParameterType(sw: JvmSignatureWriter, type: IrType, declaration: IrDeclaration) {
if (sw.skipGenericSignature()) { if (sw.skipGenericSignature()) {
typeMapper.mapType(type, TypeMappingMode.DEFAULT, sw) if (type.isInlined() && declaration.isFromJava()) {
typeMapper.mapType(type, TypeMappingMode.GENERIC_ARGUMENT, sw)
} else {
typeMapper.mapType(type, TypeMappingMode.DEFAULT, sw)
}
return return
} }
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/MemoizedInlineClassReplacements.kt
+1 -1
View File
@@ -81,7 +81,7 @@ class MemoizedInlineClassReplacements(
} }
// Otherwise, mangle functions with mangled parameters, ignoring constructors // Otherwise, mangle functions with mangled parameters, ignoring constructors
it is IrSimpleFunction && (it.hasMangledParameters || mangleReturnTypes && it.hasMangledReturnType) -> it is IrSimpleFunction && !it.isFromJava() && (it.hasMangledParameters || mangleReturnTypes && it.hasMangledReturnType) ->
if (it.dispatchReceiverParameter != null) if (it.dispatchReceiverParameter != null)
createMethodReplacement(it) createMethodReplacement(it)
else else