diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt index 353bc9722f5..1222c1a42c0 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt @@ -748,7 +748,7 @@ abstract class ObjCExportHeaderGenerator( val arguments = (throwsAnnotation.allValueArguments.values.single() as ArrayValue).value for (argument in arguments) { - val classDescriptor = TypeUtils.getClassDescriptor((argument as KClassValue).value) ?: continue + val classDescriptor = TypeUtils.getClassDescriptor((argument as KClassValue).getArgumentType(method.module)) ?: continue uncheckedExceptionClasses.firstOrNull { classDescriptor.isSubclassOf(it) }?.let { reportWarning(method, diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 1739d7bfe73..0b6beb640e9 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -2986,6 +2986,9 @@ task library_mismatch(type: RunStandaloneKonanTest) { def messages = "warning: skipping $dir/1.2/empty.klib. The library versions don't match. Expected '5.6', found '1.2'\n" + "warning: skipping $dir/3.4/empty.klib. The target doesn't match. Expected '$currentTarget', found [$someOtherTarget]\n" + + "${project.rootProject.projectDir.path}/test.output/local/library_mismatch/hello.kt:1:10: warning: parameter 'args' is never used\n" + + "fun main(args: Array) {\n" + + " ^\n" + "Hello, versioned world!\n" goldValue = isWindows() ? messages.replaceAll('\\/', '\\\\') : messages } diff --git a/extracted/konan.metadata/src/KonanProtoBuf.proto b/extracted/konan.metadata/src/KonanProtoBuf.proto index 86a9c05eb2b..7863aa9ee5e 100644 --- a/extracted/konan.metadata/src/KonanProtoBuf.proto +++ b/extracted/konan.metadata/src/KonanProtoBuf.proto @@ -37,6 +37,8 @@ extend Function { extend Property { repeated Annotation property_annotation = 170; + repeated Annotation property_getter_annotation = 177; + repeated Annotation property_setter_annotation = 178; optional bool has_backing_field = 171; optional bool used_as_variable = 172; optional Annotation.Argument.Value compile_time_value = 173; diff --git a/extracted/konan.serializer/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt b/extracted/konan.serializer/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt index df68bd79ef2..7100f3fdf65 100644 --- a/extracted/konan.serializer/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt +++ b/extracted/konan.serializer/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt @@ -11,6 +11,8 @@ object KonanSerializerProtocol : SerializerExtensionProtocol( KonanProtoBuf.classAnnotation, KonanProtoBuf.functionAnnotation, KonanProtoBuf.propertyAnnotation, + KonanProtoBuf.propertyGetterAnnotation, + KonanProtoBuf.propertySetterAnnotation, KonanProtoBuf.enumEntryAnnotation, KonanProtoBuf.compileTimeValue, KonanProtoBuf.parameterAnnotation, diff --git a/gradle.properties b/gradle.properties index 3b540c3f062..160fd95508e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,9 +19,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 testDataVersion=1226829:id -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.20-dev-1048,tag:kotlin-native,pinned:true/artifacts/content/maven -kotlinVersion=1.3.20-dev-1048 -testKotlinVersion=1.3.20-dev-1206 +kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.20-dev-1253,tag:kotlin-native,pinned:true/artifacts/content/maven +kotlinVersion=1.3.20-dev-1253 +testKotlinVersion=1.3.20-dev-1253 konanVersion=1.1.0 org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=4 diff --git a/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt b/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt index 420a994c1fd..afbc6fce32e 100644 --- a/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt +++ b/klib/src/test/kotlin/org/jetbrains/kotlin/cli/klib/test/ContentsTest.kt @@ -272,12 +272,12 @@ class ContentsTest { class Foo constructor() { @A val annotated: Int = 0 var annotatedAccessors: Int - get - set + @A get + @A set val annotatedGetter: Int = 0 - get + @A get var annotatedSetter: Int - set + @A set var privateSetter: Int private set protected val protectedSimple: Int = 0