From d17044515ff861ab745487752abfdcd659f35ad1 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Thu, 22 Feb 2024 13:56:56 +0200 Subject: [PATCH] [Tests] Update stub consistency test data Common metadata compiler now reports compilation errors. Disable tests that are not yet supported or should be skipped as JVM-specific. KTIJ-28668 --- .../ContextReceiversCallableMembers.kt | 3 +++ .../ContextReceiversOnClass/ContextReceiversOnClass.kt | 3 +++ .../ContextReceiversOnFunctionType.kt | 3 +++ .../ContextReceiversOnTopLevelCallables.kt | 3 +++ .../testData/clsFileStubBuilder/Contracts/Contracts.kt | 3 +++ .../clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt | 3 +++ .../clsFileStubBuilder/MultifileClass/MultifileClass.kt | 4 ++++ .../SecondaryConstructors/SecondaryConstructors.kt | 4 ++++ .../clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt | 4 ++++ .../testData/clsFileStubBuilder/TypeParams/TypeParams.kt | 4 ++++ 10 files changed, 34 insertions(+) diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.kt index c84a7e02d35..5b5bcc63319 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.kt @@ -1,5 +1,8 @@ // FIR_IDENTICAL // !LANGUAGE: +ContextReceivers +/* Unsupported arguments in test metadata compiler */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE private open class ContextReceiversCallableMembers { context(A, B) diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.kt index f842b2c2c37..04d37ee7cc3 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.kt @@ -1,5 +1,8 @@ // FIR_IDENTICAL // !LANGUAGE: +ContextReceivers +/* Unsupported arguments in test metadata compiler */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE context(A, B) private open class ContextReceiversOnClass { diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnFunctionType/ContextReceiversOnFunctionType.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnFunctionType/ContextReceiversOnFunctionType.kt index c7a95ef351c..35be302fe41 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnFunctionType/ContextReceiversOnFunctionType.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnFunctionType/ContextReceiversOnFunctionType.kt @@ -1,7 +1,10 @@ // FIR_IDENTICAL // JVM_FILE_NAME: ContextReceiversOnFunctionTypeKt // !LANGUAGE: +ContextReceivers +/* Unsupported arguments in test metadata compiler */ // KNM_K2_IGNORE +// KNM_FE10_IGNORE + fun f(g: context(A, B) Int.(Int) -> Int) {} class A { diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnTopLevelCallables/ContextReceiversOnTopLevelCallables.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnTopLevelCallables/ContextReceiversOnTopLevelCallables.kt index 81d443dfd2a..58c790797f6 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnTopLevelCallables/ContextReceiversOnTopLevelCallables.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnTopLevelCallables/ContextReceiversOnTopLevelCallables.kt @@ -1,6 +1,9 @@ // FIR_IDENTICAL // JVM_FILE_NAME: ContextReceiversOnTopLevelCallablesKt // !LANGUAGE: +ContextReceivers +/* Unsupported arguments in test metadata compiler */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE context(A, B) private fun Int.function(): Int = valueA + valueB diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.kt index 609c4440439..bc88219c700 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.kt @@ -1,6 +1,9 @@ // FIR_IDENTICAL // JVM_FILE_NAME: ContractsKt +/* Contract information is stored for .proto-based stubs, but not for source stubs */ +// KNM_K2_IGNORE + package test import kotlin.contracts.* diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt index 6aae9d5066f..90c3d7ecad6 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt @@ -1,5 +1,8 @@ // FIR_IGNORE // Ignored for fir, as FIR does not support org.jetbrains.kotlin.load.java.InternalFlexibleTypeTransformer +/* ft is not available in common code */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE package test diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt index cf774167b4b..d93427e834b 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt @@ -1,3 +1,7 @@ +/* Unavailable @JvmName */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE + @file:[JvmName("MultifileClass") JvmMultifileClass] package test diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt index b3c2a952807..1808da28c35 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt @@ -1,4 +1,8 @@ // FIR_IDENTICAL +/* Unavailable Serializable */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE + package test import java.io.Serializable diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt index 17ae622ec07..debed0020d3 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt @@ -1,4 +1,8 @@ // FIR_IDENTICAL +/* Unavailable JvmName */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE + @file:Suppress("UNCHECKED_CAST", "NOTHING_TO_INLINE", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") @file:JvmName("OtherKt") @file:kotlin.jvm.JvmPackageName("some.other.jvm") diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.kt index d60977cee59..1acd3545b52 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.kt @@ -1,3 +1,7 @@ +/* Unavailable Serializable */ +// KNM_K2_IGNORE +// KNM_FE10_IGNORE + package test import java.io.Serializable