From be4df3586796b25f055dbbb5537b06bd4718330f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 31 May 2023 00:09:21 +0200 Subject: [PATCH] Tests: add FILE directives to some multimodule tests To help them run on the old infrastructure, which light analysis tests are still using. --- ...serializationOfNestedAnnotationOnType_1.kt | 4 ++ ...serializationOfNestedAnnotationOnType_2.kt | 4 ++ ...visibleFunctionWithReceiverWithSuppress.kt | 5 +++ .../annotations/suppressInvisibleMember.kt | 4 ++ .../codegen/box/valueClasses/multiModules.kt | 3 +- .../codegen/box/valueClasses/multiModules.txt | 10 ++--- .../codegen/box/valueClasses/visibility.kt | 3 ++ .../codegen/box/valueClasses/visibility.txt | 44 +++++++++---------- 8 files changed, 49 insertions(+), 28 deletions(-) diff --git a/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_1.kt b/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_1.kt index 9e1def30a84..bcc35f5a7ab 100644 --- a/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_1.kt +++ b/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_1.kt @@ -2,6 +2,8 @@ // ISSUE: KT-57876 // MODULE: lib +// FILE: lib.kt + interface EnvironmentKeyProvider { interface NestedInterface : @EnvironmentKeyDescription Some @@ -12,5 +14,7 @@ interface EnvironmentKeyProvider { } // MODULE: main(lib) +// FILE: main.kt + fun bar(arg: EnvironmentKeyProvider.NestedInterface) {} fun box() = "OK" diff --git a/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_2.kt b/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_2.kt index c5715e2fd6e..6af166ad4f1 100644 --- a/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_2.kt +++ b/compiler/testData/codegen/box/annotations/deserializationOfNestedAnnotationOnType_2.kt @@ -2,6 +2,8 @@ // ISSUE: KT-57876 // MODULE: lib +// FILE: lib.kt + interface EnvironmentKeyProvider { @Target(AnnotationTarget.TYPE) annotation class EnvironmentKeyDescription @@ -10,5 +12,7 @@ interface EnvironmentKeyProvider { } // MODULE: main(lib) +// FILE: main.kt + fun foo(arg: EnvironmentKeyProvider) {} fun box() = "OK" diff --git a/compiler/testData/codegen/box/annotations/invisibleFunctionWithReceiverWithSuppress.kt b/compiler/testData/codegen/box/annotations/invisibleFunctionWithReceiverWithSuppress.kt index 1dc79bc5f5d..17e72c91317 100644 --- a/compiler/testData/codegen/box/annotations/invisibleFunctionWithReceiverWithSuppress.kt +++ b/compiler/testData/codegen/box/annotations/invisibleFunctionWithReceiverWithSuppress.kt @@ -1,6 +1,9 @@ // TARGET_BACKEND: JVM_IR // ISSUE: KT-53698 + // MODULE: lib +// FILE: lib.kt + package foo class Some(val s: String) @@ -8,6 +11,8 @@ class Some(val s: String) internal fun Some.foo(): String = s // MODULE: main(lib) +// FILE: main.kt + @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") package bar diff --git a/compiler/testData/codegen/box/annotations/suppressInvisibleMember.kt b/compiler/testData/codegen/box/annotations/suppressInvisibleMember.kt index 27c3d2a7442..f314d009f44 100644 --- a/compiler/testData/codegen/box/annotations/suppressInvisibleMember.kt +++ b/compiler/testData/codegen/box/annotations/suppressInvisibleMember.kt @@ -2,6 +2,8 @@ // ISSUE: KT-55026 // MODULE: lib +// FILE: lib.kt + interface Base { val x: String } @@ -10,6 +12,8 @@ internal class Some(override val x: String) : Base internal class Other(override val x: String) : Base // MODULE: main(lib) +// FILE: main.kt + @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") internal fun Some(): Base = Some("K") diff --git a/compiler/testData/codegen/box/valueClasses/multiModules.kt b/compiler/testData/codegen/box/valueClasses/multiModules.kt index f041dca0e19..b627412cd05 100644 --- a/compiler/testData/codegen/box/valueClasses/multiModules.kt +++ b/compiler/testData/codegen/box/valueClasses/multiModules.kt @@ -4,6 +4,7 @@ // CHECK_BYTECODE_LISTING // MODULE: dependency +// FILE: dependency.kt package dependency @@ -16,8 +17,8 @@ inline fun inlined() = dependency.DPoint(1.0, 2.0) fun id(x: dependency.DPoint) = x inline fun idInlined(x: dependency.DPoint) = x - // MODULE: main(dependency) +// FILE: main.kt package main diff --git a/compiler/testData/codegen/box/valueClasses/multiModules.txt b/compiler/testData/codegen/box/valueClasses/multiModules.txt index d63a3cbf7b0..e6e20d61acb 100644 --- a/compiler/testData/codegen/box/valueClasses/multiModules.txt +++ b/compiler/testData/codegen/box/valueClasses/multiModules.txt @@ -2,7 +2,7 @@ Module: dependency @kotlin.jvm.JvmInline @kotlin.Metadata public final class dependency/DPoint { - // source: 'module_dependency_multiModules.kt' + // source: 'dependency.kt' private final field x: double private final field y: double private synthetic method (p0: double, p1: double): void @@ -22,8 +22,8 @@ public final class dependency/DPoint { } @kotlin.Metadata -public final class dependency/Module_dependency_multiModulesKt { - // source: 'module_dependency_multiModules.kt' +public final class dependency/DependencyKt { + // source: 'dependency.kt' public final static @org.jetbrains.annotations.NotNull method f(): dependency.DPoint public final static @org.jetbrains.annotations.NotNull method id-ggqRWaI(p0: double, p1: double): dependency.DPoint public final static @org.jetbrains.annotations.NotNull method idInlined-ggqRWaI(p0: double, p1: double): dependency.DPoint @@ -31,8 +31,8 @@ public final class dependency/Module_dependency_multiModulesKt { } Module: main @kotlin.Metadata -public final class main/Module_main_multiModulesKt { - // source: 'module_main_multiModules.kt' +public final class main/MainKt { + // source: 'main.kt' public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final static @org.jetbrains.annotations.NotNull method f(): dependency.DPoint public final static @org.jetbrains.annotations.NotNull method id-ggqRWaI(p0: double, p1: double): dependency.DPoint diff --git a/compiler/testData/codegen/box/valueClasses/visibility.kt b/compiler/testData/codegen/box/valueClasses/visibility.kt index e5228e8f9ff..ecf260c0b31 100644 --- a/compiler/testData/codegen/box/valueClasses/visibility.kt +++ b/compiler/testData/codegen/box/valueClasses/visibility.kt @@ -5,6 +5,8 @@ // LANGUAGE: +ValueClasses // MODULE: dependency +// FILE: dependency.kt + @JvmInline value class MfvcDependency(val x: Int, val y: Int) { val z: Int @@ -61,6 +63,7 @@ class RegularDependency { } // MODULE: main(dependency) +// FILE: main.kt @JvmInline value class Public(val x: Int, val y: Int) { diff --git a/compiler/testData/codegen/box/valueClasses/visibility.txt b/compiler/testData/codegen/box/valueClasses/visibility.txt index 38764e87c9b..ed849e21375 100644 --- a/compiler/testData/codegen/box/valueClasses/visibility.txt +++ b/compiler/testData/codegen/box/valueClasses/visibility.txt @@ -1,7 +1,7 @@ Module: dependency @kotlin.Metadata public final class MfvcDependency$Companion { - // source: 'module_dependency_visibility.kt' + // source: 'dependency.kt' private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public final @org.jetbrains.annotations.NotNull method getT(): MfvcDependency @@ -34,7 +34,7 @@ public final class MfvcDependency$Companion { @kotlin.jvm.JvmInline @kotlin.Metadata public final class MfvcDependency { - // source: 'module_dependency_visibility.kt' + // source: 'dependency.kt' public final static @org.jetbrains.annotations.NotNull field Companion: MfvcDependency$Companion private final field x$1: int private static field x: int @@ -84,7 +84,7 @@ public final class MfvcDependency { @kotlin.Metadata public final class RegularDependency$Companion { - // source: 'module_dependency_visibility.kt' + // source: 'dependency.kt' private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public final @org.jetbrains.annotations.NotNull method getT(): MfvcDependency @@ -116,7 +116,7 @@ public final class RegularDependency$Companion { @kotlin.Metadata public final class RegularDependency { - // source: 'module_dependency_visibility.kt' + // source: 'dependency.kt' public final static @org.jetbrains.annotations.NotNull field Companion: RegularDependency$Companion private field x$1: int private static field x: int @@ -162,7 +162,7 @@ public final class RegularDependency { Module: main @kotlin.Metadata public final class Internal$Companion { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public synthetic deprecated static @kotlin.jvm.JvmStatic method getT$annotations(): void @@ -184,7 +184,7 @@ public final class Internal$Companion { @kotlin.jvm.JvmInline @kotlin.Metadata public final class Internal { - // source: 'module_main_visibility.kt' + // source: 'main.kt' public final static @org.jetbrains.annotations.NotNull field Companion: Internal$Companion private final field x$1: int private static field x: int @@ -222,7 +222,7 @@ public final class Internal { @kotlin.jvm.JvmInline @kotlin.Metadata public final class InternalInternal { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -244,7 +244,7 @@ public final class InternalInternal { @kotlin.jvm.JvmInline @kotlin.Metadata public final class InternalPrivate { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -266,7 +266,7 @@ public final class InternalPrivate { @kotlin.jvm.JvmInline @kotlin.Metadata public final class InternalPublic { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -286,8 +286,8 @@ public final class InternalPublic { } @kotlin.Metadata -public final class Module_main_visibilityKt { - // source: 'module_main_visibility.kt' +public final class MainKt { + // source: 'main.kt' public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String public final inner class MfvcDependency$Companion public final inner class Regular$Companion @@ -297,7 +297,7 @@ public final class Module_main_visibilityKt { @kotlin.jvm.JvmInline @kotlin.Metadata public final class Private { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field x: int private final field y: int private synthetic method (p0: int, p1: int): void @@ -317,7 +317,7 @@ public final class Private { @kotlin.jvm.JvmInline @kotlin.Metadata public final class PrivateInternal { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -339,7 +339,7 @@ public final class PrivateInternal { @kotlin.jvm.JvmInline @kotlin.Metadata public final class PrivatePrivate { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -361,7 +361,7 @@ public final class PrivatePrivate { @kotlin.jvm.JvmInline @kotlin.Metadata public final class PrivatePublic { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -382,7 +382,7 @@ public final class PrivatePublic { @kotlin.Metadata public final class Public$Companion { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public final @org.jetbrains.annotations.NotNull method getT(): Public @@ -401,7 +401,7 @@ public final class Public$Companion { @kotlin.jvm.JvmInline @kotlin.Metadata public final class Public { - // source: 'module_main_visibility.kt' + // source: 'main.kt' public final static @org.jetbrains.annotations.NotNull field Companion: Public$Companion private final field x$1: int private static field x: int @@ -435,7 +435,7 @@ public final class Public { @kotlin.jvm.JvmInline @kotlin.Metadata public final class PublicInternal { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -457,7 +457,7 @@ public final class PublicInternal { @kotlin.jvm.JvmInline @kotlin.Metadata public final class PublicPrivate { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -479,7 +479,7 @@ public final class PublicPrivate { @kotlin.jvm.JvmInline @kotlin.Metadata public final class PublicPublic { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private final field value-x: int private final field value-y: int private synthetic method (p0: int, p1: int): void @@ -500,7 +500,7 @@ public final class PublicPublic { @kotlin.Metadata public final class Regular$Companion { - // source: 'module_main_visibility.kt' + // source: 'main.kt' private method (): void public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void public synthetic final static method access$getJvmStaticX3(p0: Regular$Companion): Public @@ -682,7 +682,7 @@ public final class Regular$Companion { @kotlin.Metadata public final class Regular { - // source: 'module_main_visibility.kt' + // source: 'main.kt' public final static @org.jetbrains.annotations.NotNull field Companion: Regular$Companion private static field jvmStaticX1-x: int private static field jvmStaticX1-y: int