diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt index 5e5e39a5041..a1a53bc87fa 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt @@ -277,7 +277,7 @@ abstract class AnnotationCodegen( companion object { private fun isInvisibleFromTheOutside(declaration: IrDeclaration?): Boolean { - if (declaration is IrSimpleFunction && declaration.origin.isSynthetic) { + if (declaration != null && declaration.origin.isSynthetic) { return true } if (declaration is IrDeclarationWithVisibility) { diff --git a/compiler/testData/codegen/bytecodeListing/annotations/onProperties.kt b/compiler/testData/codegen/bytecodeListing/annotations/onProperties.kt index c16d367b387..0f135bf929c 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/onProperties.kt +++ b/compiler/testData/codegen/bytecodeListing/annotations/onProperties.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm -// IGNORE_BACKEND: JVM_IR import kotlin.reflect.KProperty diff --git a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.kt b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.kt index 7ce60715062..8e91d07b7a3 100644 --- a/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.kt +++ b/compiler/testData/codegen/bytecodeListing/companionObjectVisibility_before.kt @@ -1,5 +1,4 @@ // !LANGUAGE: -ProperVisibilityForCompanionObjectInstanceField -// IGNORE_BACKEND: JVM_IR open class TestProtectedCompanionInClass { protected companion object diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt index 9e174695321..ca538466d43 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt @@ -4,7 +4,7 @@ final class Controller$multipleSuspensions$1 { field L$0: java.lang.Object field label: int synthetic field result: java.lang.Object - synthetic final @org.jetbrains.annotations.NotNull field this$0: Controller + synthetic final field this$0: Controller inner class Controller$multipleSuspensions$1 method (p0: Controller, p1: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object @@ -16,7 +16,7 @@ final class Controller$nonTailCall$1 { field L$0: java.lang.Object field label: int synthetic field result: java.lang.Object - synthetic final @org.jetbrains.annotations.NotNull field this$0: Controller + synthetic final field this$0: Controller inner class Controller$nonTailCall$1 method (p0: Controller, p1: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object @@ -36,7 +36,7 @@ public final class Controller { @kotlin.coroutines.jvm.internal.DebugMetadata @kotlin.Metadata final class CoroutineFieldsKt$box$1 { - synthetic final @org.jetbrains.annotations.NotNull field $result: kotlin.jvm.internal.Ref$ObjectRef + synthetic final field $result: kotlin.jvm.internal.Ref$ObjectRef field J$0: long field L$0: java.lang.Object field L$1: java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt index 93b89eab73b..70626108043 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt @@ -12,7 +12,7 @@ public interface FlowCollector { public final class TcoContinuationKt$collect$2$emit$1 { field label: int synthetic field result: java.lang.Object - synthetic final @org.jetbrains.annotations.NotNull field this$0: TcoContinuationKt$collect$2 + synthetic final field this$0: TcoContinuationKt$collect$2 inner class TcoContinuationKt$collect$2 inner class TcoContinuationKt$collect$2$emit$1 public method (p0: TcoContinuationKt$collect$2, p1: kotlin.coroutines.Continuation): void @@ -21,7 +21,7 @@ public final class TcoContinuationKt$collect$2$emit$1 { @kotlin.Metadata public final class TcoContinuationKt$collect$2 { - synthetic final @org.jetbrains.annotations.NotNull field $action: kotlin.jvm.functions.Function2 + synthetic final field $action: kotlin.jvm.functions.Function2 inner class TcoContinuationKt$collect$2 inner class TcoContinuationKt$collect$2$emit$1 public method (p0: kotlin.jvm.functions.Function2): void @@ -33,7 +33,7 @@ public final class TcoContinuationKt$collect$2 { public final class TcoContinuationKt$flow$1$collect$1 { field label: int synthetic field result: java.lang.Object - synthetic final @org.jetbrains.annotations.NotNull field this$0: TcoContinuationKt$flow$1 + synthetic final field this$0: TcoContinuationKt$flow$1 inner class TcoContinuationKt$flow$1 inner class TcoContinuationKt$flow$1$collect$1 public method (p0: TcoContinuationKt$flow$1, p1: kotlin.coroutines.Continuation): void @@ -42,7 +42,7 @@ public final class TcoContinuationKt$flow$1$collect$1 { @kotlin.Metadata public final class TcoContinuationKt$flow$1 { - synthetic final @org.jetbrains.annotations.NotNull field $block: kotlin.jvm.functions.Function2 + synthetic final field $block: kotlin.jvm.functions.Function2 inner class TcoContinuationKt$flow$1 inner class TcoContinuationKt$flow$1$collect$1 public method (p0: kotlin.jvm.functions.Function2): void diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt index 49d36da603e..ca4bb71a2a3 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor_ir.txt @@ -11,7 +11,7 @@ public final class Sealed$Derived { @kotlin.Metadata public final class Sealed$Inner { - synthetic final @org.jetbrains.annotations.NotNull field this$0: Sealed + synthetic final field this$0: Sealed private final field z2: int inner class Sealed$Inner public synthetic @Ann method (p0: Sealed, p1: int, @Ann p2: int, @Ann p3: java.lang.String, p4: kotlin.jvm.internal.DefaultConstructorMarker): void @@ -31,7 +31,7 @@ public abstract class Sealed { @kotlin.Metadata public final class Test$Inner { - synthetic final @org.jetbrains.annotations.NotNull field this$0: Test + synthetic final field this$0: Test private final field z2: int inner class Test$Inner public synthetic @Ann method (p0: Test, p1: int, @Ann p2: int, @Ann p3: java.lang.String, p4: kotlin.jvm.internal.DefaultConstructorMarker): void diff --git a/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt b/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt index 0a4312659e7..458b4f14add 100644 --- a/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt +++ b/compiler/testData/codegen/bytecodeListing/jvmOverloadsAndParametersAnnotations.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR // WITH_RUNTIME annotation class StringRes