Update NativePlatformAnalyzerServices from Kotlin/Native repo
This commit is contained in:
+6
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.resolve.konan.platform
|
package org.jetbrains.kotlin.resolve.konan.platform
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.name.FqName
|
||||||
import org.jetbrains.kotlin.resolve.*
|
import org.jetbrains.kotlin.resolve.*
|
||||||
import org.jetbrains.kotlin.storage.StorageManager
|
import org.jetbrains.kotlin.storage.StorageManager
|
||||||
|
|
||||||
@@ -14,4 +15,9 @@ object NativePlatformAnalyzerServices : PlatformDependentAnalyzerServices() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override val platformConfigurator: PlatformConfigurator = NativePlatformConfigurator
|
override val platformConfigurator: PlatformConfigurator = NativePlatformConfigurator
|
||||||
|
|
||||||
|
override val excludedImports: List<FqName> =
|
||||||
|
listOf("identityHashCode").map {
|
||||||
|
FqName("kotlin.native.$it")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+13
@@ -7,14 +7,19 @@ package org.jetbrains.kotlin.resolve.konan.platform
|
|||||||
|
|
||||||
import org.jetbrains.kotlin.container.StorageComponentContainer
|
import org.jetbrains.kotlin.container.StorageComponentContainer
|
||||||
import org.jetbrains.kotlin.container.useImpl
|
import org.jetbrains.kotlin.container.useImpl
|
||||||
|
import org.jetbrains.kotlin.container.useInstance
|
||||||
|
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
|
||||||
|
import org.jetbrains.kotlin.psi.KtCallableDeclaration
|
||||||
import org.jetbrains.kotlin.resolve.*
|
import org.jetbrains.kotlin.resolve.*
|
||||||
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
|
||||||
|
import org.jetbrains.kotlin.resolve.inline.ReasonableInlineRule
|
||||||
import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker
|
import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker
|
||||||
|
|
||||||
object NativePlatformConfigurator : PlatformConfiguratorBase(
|
object NativePlatformConfigurator : PlatformConfiguratorBase(
|
||||||
additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker())
|
additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker())
|
||||||
) {
|
) {
|
||||||
override fun configureModuleComponents(container: StorageComponentContainer) {
|
override fun configureModuleComponents(container: StorageComponentContainer) {
|
||||||
|
container.useInstance(NativeInliningRule)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun configureModuleDependentCheckers(container: StorageComponentContainer) {
|
override fun configureModuleDependentCheckers(container: StorageComponentContainer) {
|
||||||
@@ -22,3 +27,11 @@ object NativePlatformConfigurator : PlatformConfiguratorBase(
|
|||||||
container.useImpl<ExpectedActualDeclarationChecker>()
|
container.useImpl<ExpectedActualDeclarationChecker>()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
object NativeInliningRule : ReasonableInlineRule {
|
||||||
|
override fun isInlineReasonable(
|
||||||
|
descriptor: CallableMemberDescriptor,
|
||||||
|
declaration: KtCallableDeclaration,
|
||||||
|
context: BindingContext
|
||||||
|
): Boolean = true
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user