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

[PL] W/a for broken @Deprecated annotations in existing c-interop KLIBs

Browse Source 
^KT-59030
This commit is contained in:
Dmitriy Dolovov
2023-06-01 15:35:55 +02:00
committed by Space Team
parent b96e5b072a
commit 280caf003f
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartiallyLinkedIrTreePatcher.kt
+15 -5
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.addToStdlib.ifTrue import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
import org.jetbrains.kotlin.utils.compact import org.jetbrains.kotlin.utils.compact
@@ -688,7 +689,8 @@ internal class PartiallyLinkedIrTreePatcher(
} }
protected inline fun IrMemberAccessExpression<IrFunctionSymbol>.checkArgumentsAndValueParameters( protected inline fun IrMemberAccessExpression<IrFunctionSymbol>.checkArgumentsAndValueParameters(
usedDefaultArgumentsConsumer: (IrExpressionBody) -> Unit = {} checkDefaultArgument: (index: Int, defaultArgumentExpressionBody: IrExpressionBody?) -> Boolean =
{ _, defaultArgumentExpressionBody -> defaultArgumentExpressionBody != null }
): PartialLinkageCase? { ): PartialLinkageCase? {
val function = symbol.owner val function = symbol.owner
@@ -795,9 +797,9 @@ internal class PartiallyLinkedIrTreePatcher(
val defaultArgumentExpressionBody = functionsToCheckDefaultValues.firstNotNullOfOrNull { val defaultArgumentExpressionBody = functionsToCheckDefaultValues.firstNotNullOfOrNull {
it.valueParameters.getOrNull(index)?.defaultValue it.valueParameters.getOrNull(index)?.defaultValue
} }
defaultArgumentExpressionBody?.let(usedDefaultArgumentsConsumer)
return@count defaultArgumentExpressionBody != null || function.valueParameters.getOrNull(index)?.isVararg == true return@count checkDefaultArgument(index, defaultArgumentExpressionBody)
|| function.valueParameters.getOrNull(index)?.isVararg == true
} }
val functionValueParameterCount = function.valueParameters.size val functionValueParameterCount = function.valueParameters.size
@@ -904,9 +906,14 @@ internal class PartiallyLinkedIrTreePatcher(
} ?: run { } ?: run {
val annotationFile by lazy { PLFile.determineFileFor(symbol.owner) } val annotationFile by lazy { PLFile.determineFileFor(symbol.owner) }
checkArgumentsAndValueParameters { defaultArgumentExpressionBody -> checkArgumentsAndValueParameters { index, defaultArgumentExpressionBody ->
val defaultArgument = defaultArgumentExpressionBody.expression val defaultArgument = defaultArgumentExpressionBody?.expression
when { when {
defaultArgument == null -> {
// A workaround for KT-59030. See also KT-58651.
val valueParameter = symbol.owner.valueParameters.getOrNull(index)
return@checkArgumentsAndValueParameters valueParameter?.hasEqualFqName(REPLACE_WITH_CONSTRUCTOR_EXPRESSION_FIELD_FQN) == true
}
defaultArgument is IrConst<*> -> { defaultArgument is IrConst<*> -> {
// Nothing can be unlinked here. // Nothing can be unlinked here.
} }
@@ -928,6 +935,7 @@ internal class PartiallyLinkedIrTreePatcher(
} }
} }
} }
true // Count the current default value as non-missing.
} }
} }
} }
@@ -1136,5 +1144,7 @@ internal class PartiallyLinkedIrTreePatcher(
is IrWhen, is IrLoop, is IrTry, is IrSuspensionPoint, is IrSuspendableExpression -> true is IrWhen, is IrLoop, is IrTry, is IrSuspensionPoint, is IrSuspendableExpression -> true
else -> false else -> false
} }
private val REPLACE_WITH_CONSTRUCTOR_EXPRESSION_FIELD_FQN = FqName("kotlin.ReplaceWith.<init>.expression")
} }
} }