diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index 61fdc79803b..27cabc04763 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -1328,6 +1328,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map throw IllegalStateException("safe cast wasn't lowered") IrTypeOperator.INSTANCEOF -> evaluateInstanceOf(value) IrTypeOperator.NOT_INSTANCEOF -> evaluateNotInstanceOf(value) + IrTypeOperator.SAM_CONVERSION -> TODO(ir2string(value)) } } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DeepCopyIrTreeWithDescriptors.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DeepCopyIrTreeWithDescriptors.kt index d99a0c4cde6..6b81750d918 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DeepCopyIrTreeWithDescriptors.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DeepCopyIrTreeWithDescriptors.kt @@ -789,7 +789,8 @@ internal class DeepCopyIrTreeWithDescriptors(val targetDescriptor: FunctionDescr IrTypeOperator.IMPLICIT_CAST, IrTypeOperator.IMPLICIT_NOTNULL, IrTypeOperator.IMPLICIT_COERCION_TO_UNIT, - IrTypeOperator.IMPLICIT_INTEGER_COERCION -> type + IrTypeOperator.IMPLICIT_INTEGER_COERCION, + IrTypeOperator.SAM_CONVERSION -> type IrTypeOperator.SAFE_CAST -> type.makeNullable() IrTypeOperator.INSTANCEOF, IrTypeOperator.NOT_INSTANCEOF -> context.irBuiltIns.booleanType diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt index ba468a77bcd..f7452754ccd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt @@ -382,6 +382,7 @@ internal class EnumClassLowering(val context: Context) : ClassLoweringPass { } return IrAnonymousInitializerImpl(startOffset, endOffset, DECLARATION_ORIGIN_ENUM, loweredEnum.implObject.descriptor).apply { + parent = irClass body = context.createIrBuilder(symbol, startOffset, endOffset).irBlockBody(irClass) { val instances = irTemporary(irGetField(irGet(loweredEnum.implObject.thisReceiver!!), loweredEnum.valuesField)) enumEntries diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index b2a89c3aaf8..c5c9dfd2d91 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -48,7 +48,7 @@ repositories { dependencies { cli_bc project(path: ':backend.native', configuration: 'cli_bc') - update_tests (group: 'org', name: 'Kotlin_1320_CompilerAllPlugins', version: testKotlinVersion) { + update_tests (group: 'org', name: 'Kotlin_dev_CompilerAllPlugins', version: testKotlinVersion) { artifact { name = 'internal/kotlin-test-data' type = 'zip' diff --git a/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt b/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt index dd926cf5cbf..1ef421ec544 100644 --- a/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt +++ b/extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.resolve.lazy.DelegationFilter import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes import org.jetbrains.kotlin.types.DynamicTypesSettings -object KonanPlatformConfigurator : PlatformConfigurator( +object KonanPlatformConfigurator : PlatformConfiguratorBase( DynamicTypesSettings(), additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()), additionalCallCheckers = listOf( diff --git a/gradle.properties b/gradle.properties index 7d3d21a39ef..8a90019c73c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,9 +18,9 @@ buildKotlinVersion=1.3.0-rc-116 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_CompilerAllPlugins),number:1.3.0-rc-116,tag:kotlin-native,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_1320_CompilerAllPlugins),number:1.3.20-eap-15,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.3.20-eap-15 -testKotlinVersion=1.3.20-eap-15 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-445,pinned:false/artifacts/content/maven +kotlinVersion=1.3.30-dev-445 +testKotlinVersion=1.3.30-dev-445 konanVersion=1.2.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4