diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/collectors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/collectors.kt index 5dd1ca3718e..2f7a34f7033 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/collectors.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/collectors.kt @@ -57,7 +57,6 @@ internal inline fun FunctionCollector( if (candidate.kind.isReal && !candidate.isKniBridgeFunction() && !candidate.isDeprecatedTopLevelFunction() - && !candidate.isIgnoredDarwinFunction() ) { typedCollector(candidate) } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt index 0136225933c..47ab197c7c9 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.descriptors.commonizer.utils import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor -import org.jetbrains.kotlin.types.getAbbreviation internal const val KNI_BRIDGE_FUNCTION_PREFIX = "kniBridge" @@ -16,22 +15,3 @@ internal fun SimpleFunctionDescriptor.isKniBridgeFunction() = internal fun SimpleFunctionDescriptor.isDeprecatedTopLevelFunction() = containingDeclaration is PackageFragmentDescriptor && annotations.hasAnnotation(DEPRECATED_ANNOTATION_FQN) - -// the following logic determines Kotlin functions with conflicting overloads in Darwin library: -internal fun SimpleFunctionDescriptor.isIgnoredDarwinFunction(): Boolean { - if ((containingDeclaration as? PackageFragmentDescriptor)?.fqName?.isUnderDarwinPackage != true) - return false - - val name = name.asString() - if (!name.startsWith("simd_") && !name.startsWith("__")) - return false - - return valueParameters.any { parameter -> - val type = parameter.type - val abbreviationType = type.getAbbreviation() - - abbreviationType != null - && abbreviationType.declarationDescriptor.name.asString().startsWith("simd_") - && type.declarationDescriptor.name.asString() == "Vector128" - } -} diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt index aab396b9249..ef3085ea234 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt @@ -36,7 +36,6 @@ private val KOTLIN_NATIVE_SYNTHETIC_PACKAGES = ForwardDeclarationsFqNames.synthe } private const val CINTEROP_PACKAGE = "kotlinx.cinterop" -private const val DARWIN_PACKAGE = "platform.darwin" private val OBJC_INTEROP_CALLABLE_ANNOTATIONS = listOf( "ObjCMethod", @@ -56,9 +55,6 @@ internal val FqName.isUnderStandardKotlinPackages: Boolean internal val FqName.isUnderKotlinNativeSyntheticPackages: Boolean get() = hasAnyPrefix(KOTLIN_NATIVE_SYNTHETIC_PACKAGES) -internal val FqName.isUnderDarwinPackage: Boolean - get() = asString().hasPrefix(DARWIN_PACKAGE) - @Suppress("NOTHING_TO_INLINE") private inline fun FqName.hasAnyPrefix(prefixes: List): Boolean = asString().let { fqName -> prefixes.any(fqName::hasPrefix) }