diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt index c8bb76a50ba..ed727468178 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// IGNORE_BACKEND: JVM_IR import java.util.AbstractMap import java.util.Collections diff --git a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt index 3590ec415a5..de99c8be0c0 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt @@ -1,5 +1,6 @@ // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: NATIVE +// IGNORE_BACKEND: JVM_IR class A : HashMap() fun box(): String { diff --git a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt index f8c5237fa08..384052fc561 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt +++ b/compiler/testData/codegen/box/casts/mutableCollections/asWithMutable.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR +// IGNORE_BACKEND: JS_IR, JVM_IR // WITH_RUNTIME class Itr : Iterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt b/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt index 4a5ff4e3f5f..b6a1c326c1d 100644 --- a/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt +++ b/compiler/testData/codegen/box/casts/mutableCollections/isWithMutable.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR +// IGNORE_BACKEND: JS_IR, JVM_IR // WITH_RUNTIME class Itr : Iterator by ArrayList().iterator() diff --git a/compiler/testData/codegen/box/functions/bigArity/callFunViaVararg.kt b/compiler/testData/codegen/box/functions/bigArity/callFunViaVararg.kt deleted file mode 100644 index b78cf01ec82..00000000000 --- a/compiler/testData/codegen/box/functions/bigArity/callFunViaVararg.kt +++ /dev/null @@ -1,77 +0,0 @@ -// !LANGUAGE: +FunctionTypesWithBigArity -// WITH_RUNTIME -// TARGET_BACKEND: JVM_IR -// FILE: J.java - -// import kotlin.jvm.functions.Arity; -import kotlin.jvm.functions.FunctionN; -import kotlin.Unit; -import java.util.Arrays; - -public class J { - // TODO: uncomment arity as soon as Arity is introduced - public static void test(/* @Arity(30) */ FunctionN f) { - Object o = new Integer(0); - for (int i = 0; i < 42; i++) { - Object[] args = new Object[i]; - Arrays.fill(args, o); - try { - if (f.invoke(args).intValue() != 300 + i) { - throw new AssertionError("Bad return value from function"); - } - } catch (IllegalArgumentException e) { - if (i == 3 || i == 13 || i == 30 || i == 33) { - throw new AssertionError(String.format("Call with %d arguments is expected to succeed", i), e); - } - // OK - - if (!e.getMessage().contains("30")) { - throw new AssertionError("Exception must specify the expected number of arguments: " + e.getMessage(), e); - } - - continue; - } catch (Throwable e) { - throw new AssertionError( - "Incorrect exception (IllegalArgumentException expected): " + e.getClass().getName() + ", i = " + i, e - ); - } - if (i != 3 && i != 13 && i != 30 && i != 33) { - throw new AssertionError ("IllegalArgumentException expected, but nothing was thrown, i = " + i); - } - } - } -} - -// FILE: K.kt - -class Fun : (Int, Int, Int) -> Int, - (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) -> Int, - (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, - Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) -> Int, - (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, - Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) -> Int { - override fun invoke(p00: Int, p01: Int, p02: Int): Int = 303 - - override fun invoke( - p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int, - p10: Int, p11: Int, p12: Int - ): Int = 313 - - override fun invoke( - p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int, - p10: Int, p11: Int, p12: Int, p13: Int, p14: Int, p15: Int, p16: Int, p17: Int, p18: Int, p19: Int, - p20: Int, p21: Int, p22: Int, p23: Int, p24: Int, p25: Int, p26: Int, p27: Int, p28: Int, p29: Int - ): Int = 330 - - override fun invoke( - p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int, - p10: Int, p11: Int, p12: Int, p13: Int, p14: Int, p15: Int, p16: Int, p17: Int, p18: Int, p19: Int, - p20: Int, p21: Int, p22: Int, p23: Int, p24: Int, p25: Int, p26: Int, p27: Int, p28: Int, p29: Int, - p30: Int, p31: Int, p32: Int - ): Int = 333 -} - -fun box(): String { - J.test(Fun() as kotlin.jvm.functions.FunctionN) - return "OK" -} diff --git a/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt index 313c0893ff8..b943b3b4707 100644 --- a/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt +++ b/compiler/testData/codegen/box/jdk/iteratingOverHashMap.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR +// IGNORE_BACKEND: JS_IR, JVM_IR fun box() : String { if (!testIteratingOverMap1()) return "fail 1" diff --git a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt b/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt index 98952d30837..933b389311d 100644 --- a/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt +++ b/compiler/testData/codegen/box/specialBuiltins/entrySetSOE.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR +// IGNORE_BACKEND: JS_IR, JVM_IR // IGNORE_BACKEND: NATIVE open class Map1 : HashMap() diff --git a/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt b/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt index 1db20a40694..620f73f98dd 100644 --- a/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt +++ b/compiler/testData/codegen/box/super/superConstructor/kt17464_linkedMapOf.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR +// IGNORE_BACKEND: JS_IR, JVM_IR // WITH_RUNTIME // FULL_JDK diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index e1099a24583..7c8ca8a4dc2 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -10704,11 +10704,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/functions/bigArity/callFromJava.kt"); } - @TestMetadata("callFunViaVararg.kt") - public void testCallFunViaVararg() throws Exception { - runTest("compiler/testData/codegen/box/functions/bigArity/callFunViaVararg.kt"); - } - @TestMetadata("callWithIncorrectNumberOfArguments.kt") public void testCallWithIncorrectNumberOfArguments() throws Exception { runTest("compiler/testData/codegen/box/functions/bigArity/callWithIncorrectNumberOfArguments.kt"); diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java index e817011d63a..ddd6ce3ae27 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java @@ -135,6 +135,11 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); } + @TestMetadata("HiddenConstructorWithInlineClassParameters.kt") + public void testHiddenConstructorWithInlineClassParameters() throws Exception { + runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.kt"); + } + @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { runTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");