From cd9209a7ee077f739dac5c893246132dd3953612 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 24 Apr 2023 18:59:00 +0200 Subject: [PATCH] JVM: enable -Xlambdas=class in some codegen tests Most of these tests check the specific structure of lambdas when they are generated as classes, and they start to fail once invokedynamic lambdas are enabled by default. --- compiler/testData/codegen/box/closures/kt23881.kt | 1 + compiler/testData/codegen/box/closures/noRefToOuter.kt | 2 +- .../testData/codegen/box/closures/refsAreSerializable.kt | 3 ++- .../codegen/box/functions/functionNtoStringNoReflect.kt | 8 ++------ .../codegen/box/jvm8/defaults/allCompatibility/kt11969.kt | 1 + compiler/testData/codegen/box/jvm8/kt11969.kt | 2 ++ .../codegen/box/reflection/enclosing/classInLambda.kt | 2 +- .../reflection/enclosing/functionExpressionInProperty.kt | 1 + .../testData/codegen/box/reflection/enclosing/kt11969.kt | 2 ++ .../testData/codegen/box/reflection/enclosing/kt6368.kt | 2 +- .../reflection/enclosing/kt6691_lambdaInSamConstructor.kt | 5 +++-- .../box/reflection/enclosing/lambdaInClassObject.kt | 1 + .../box/reflection/enclosing/lambdaInConstructor.kt | 3 ++- .../codegen/box/reflection/enclosing/lambdaInFunction.kt | 2 +- .../codegen/box/reflection/enclosing/lambdaInLambda.kt | 2 +- .../reflection/enclosing/lambdaInLocalClassConstructor.kt | 1 + .../reflection/enclosing/lambdaInLocalClassSuperCall.kt | 2 +- .../box/reflection/enclosing/lambdaInLocalFunction.kt | 2 +- .../box/reflection/enclosing/lambdaInMemberFunction.kt | 3 ++- .../enclosing/lambdaInMemberFunctionInLocalClass.kt | 2 +- .../enclosing/lambdaInMemberFunctionInNestedClass.kt | 2 +- .../box/reflection/enclosing/lambdaInObjectDeclaration.kt | 1 + .../box/reflection/enclosing/lambdaInObjectExpression.kt | 1 + .../enclosing/lambdaInObjectLiteralSuperCall.kt | 2 +- .../codegen/box/reflection/enclosing/lambdaInPackage.kt | 1 + .../box/reflection/enclosing/lambdaInPropertyDelegate.kt | 2 ++ .../box/reflection/enclosing/lambdaInPropertyGetter.kt | 2 +- .../box/reflection/enclosing/lambdaInPropertySetter.kt | 2 +- .../codegen/box/reflection/enclosing/objectInLambda.kt | 2 +- .../genericSignature/functionLiteralGenericSignature.kt | 1 + .../codegen/boxInline/enclosingInfo/anonymousInLambda.kt | 1 + .../codegen/boxInline/signature/typeParameterInLambda.kt | 1 + .../companion/privateCompanionObjectAccessors_after.kt | 3 ++- .../companion/protectedCompanionObjectAccessors_after.kt | 4 ++-- .../codegen/bytecodeText/constClosureOptimization.kt | 2 ++ .../bytecodeText/inline/deleteClassOnTransformation.kt | 2 ++ compiler/testData/codegen/bytecodeText/kt10259.kt | 2 ++ compiler/testData/codegen/bytecodeText/kt9603.kt | 4 +++- .../codegen/bytecodeText/outerClass/classInClinit.kt | 1 + .../kotlin/js/test/JsCodegenBoxTestGenerated.java | 6 ------ .../kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java | 6 ------ .../kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java | 6 ------ .../kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java | 6 ------ .../blackboxtest/FirNativeCodegenBoxTestGenerated.java | 6 ------ .../FirNativeCodegenBoxTestNoPLGenerated.java | 6 ------ .../konan/blackboxtest/NativeCodegenBoxTestGenerated.java | 6 ------ .../blackboxtest/NativeCodegenBoxTestNoPLGenerated.java | 6 ------ .../kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java | 5 ----- 48 files changed, 55 insertions(+), 81 deletions(-) diff --git a/compiler/testData/codegen/box/closures/kt23881.kt b/compiler/testData/codegen/box/closures/kt23881.kt index 3f2ae962c6b..136cbf64eef 100644 --- a/compiler/testData/codegen/box/closures/kt23881.kt +++ b/compiler/testData/codegen/box/closures/kt23881.kt @@ -1,5 +1,6 @@ // TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM +// LAMBDAS: CLASS // WITH_STDLIB class ShouldBeCaptured diff --git a/compiler/testData/codegen/box/closures/noRefToOuter.kt b/compiler/testData/codegen/box/closures/noRefToOuter.kt index a8e5948b455..c6b5a70478f 100644 --- a/compiler/testData/codegen/box/closures/noRefToOuter.kt +++ b/compiler/testData/codegen/box/closures/noRefToOuter.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_STDLIB class A { diff --git a/compiler/testData/codegen/box/closures/refsAreSerializable.kt b/compiler/testData/codegen/box/closures/refsAreSerializable.kt index 05c2060bada..e03e63acb66 100644 --- a/compiler/testData/codegen/box/closures/refsAreSerializable.kt +++ b/compiler/testData/codegen/box/closures/refsAreSerializable.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// WITH_STDLIB import java.io.* @@ -13,7 +14,7 @@ fun box(): String { var c = '1' var z = true - val lambda = fun(): String { + val lambda = @JvmSerializableLambda fun(): String { o = "OK" b++; d++; f++; i++; j++; s++; c++ z = false diff --git a/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt b/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt index 1087aa3f6f6..1a515fb8152 100644 --- a/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt +++ b/compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// LAMBDAS: CLASS fun check(expected: String, obj: Any?) { val actual = obj.toString() diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt index 66cf7694bb9..a6979f3529b 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt @@ -3,6 +3,7 @@ // IGNORE_BACKEND: ANDROID // JVM_TARGET: 1.8 // WITH_STDLIB +// LAMBDAS: CLASS interface Z { private fun privateFun() = { "OK" } diff --git a/compiler/testData/codegen/box/jvm8/kt11969.kt b/compiler/testData/codegen/box/jvm8/kt11969.kt index 8a9ea4aae3c..aa5e42ebc48 100644 --- a/compiler/testData/codegen/box/jvm8/kt11969.kt +++ b/compiler/testData/codegen/box/jvm8/kt11969.kt @@ -1,6 +1,8 @@ // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_STDLIB +// LAMBDAS: CLASS + package test interface Z { diff --git a/compiler/testData/codegen/box/reflection/enclosing/classInLambda.kt b/compiler/testData/codegen/box/reflection/enclosing/classInLambda.kt index 9e31087a5f7..0545a08ada7 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/classInLambda.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/classInLambda.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT fun box(): String { diff --git a/compiler/testData/codegen/box/reflection/enclosing/functionExpressionInProperty.kt b/compiler/testData/codegen/box/reflection/enclosing/functionExpressionInProperty.kt index a15a567d50d..bfc8b4a71e9 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/functionExpressionInProperty.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/functionExpressionInProperty.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // has declaring class on Android 4.4 // IGNORE_BACKEND: ANDROID diff --git a/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt b/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt index d43475d92f5..2987009a7cd 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/kt11969.kt @@ -1,5 +1,7 @@ // WITH_STDLIB // TARGET_BACKEND: JVM +// LAMBDAS: CLASS + package test interface Z { diff --git a/compiler/testData/codegen/box/reflection/enclosing/kt6368.kt b/compiler/testData/codegen/box/reflection/enclosing/kt6368.kt index bfe7a75c733..36c74cb119c 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/kt6368.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/kt6368.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT import java.util.HashMap diff --git a/compiler/testData/codegen/box/reflection/enclosing/kt6691_lambdaInSamConstructor.kt b/compiler/testData/codegen/box/reflection/enclosing/kt6691_lambdaInSamConstructor.kt index 617c2c56555..426bcd5696b 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/kt6691_lambdaInSamConstructor.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/kt6691_lambdaInSamConstructor.kt @@ -1,8 +1,9 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // SAM_CONVERSIONS: CLASS -// ^ SAM-convertion classes created with LambdaMetafactory have 'enclosingMethod' and 'enclosingClass' - +// ^ Lambdas generated by LambdaMetafactory do not have 'enclosingMethod' or 'enclosingClass' // WITH_REFLECT + package test var lambda = {} diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInClassObject.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInClassObject.kt index 454c4fe2077..db346c8fb50 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInClassObject.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInClassObject.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // has declaring class on Android 4.4 // IGNORE_BACKEND: ANDROID diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInConstructor.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInConstructor.kt index d358b73f6ea..3a59a6ebb63 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInConstructor.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInConstructor.kt @@ -1,6 +1,7 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT + package test class C { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInFunction.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInFunction.kt index 8cf63fb13fe..5b811ba9c64 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInFunction.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInFunction.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT fun box(): String { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLambda.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLambda.kt index d5f738f4460..b6d65c8159f 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLambda.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLambda.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT fun box(): String { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassConstructor.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassConstructor.kt index 8fdee638e4f..75f46705f72 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassConstructor.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassConstructor.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // WITH_REFLECT open class C diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassSuperCall.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassSuperCall.kt index 42fa223bf7a..4f2e913f332 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassSuperCall.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalClassSuperCall.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT open class C(val a: Any) diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalFunction.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalFunction.kt index afbcf6c3ec5..df185883ff3 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalFunction.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInLocalFunction.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT // WITH_HELPERS diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunction.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunction.kt index c3d6a61290c..73c260d33e4 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunction.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunction.kt @@ -1,6 +1,7 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT + package test class C { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt index b323b6c4bca..1771fb341a4 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT fun box(): String { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInNestedClass.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInNestedClass.kt index 9f41d496659..620b95d88a9 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInNestedClass.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInMemberFunctionInNestedClass.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT class C { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectDeclaration.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectDeclaration.kt index fe30549af0d..64d92dda469 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectDeclaration.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectDeclaration.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // has declaring class on Android 4.4 // IGNORE_BACKEND: ANDROID diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectExpression.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectExpression.kt index 2a05c7f56f3..f3604c80efe 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectExpression.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectExpression.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // WITH_REFLECT interface C { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt index d4d91244bc0..b21b639919d 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT open class C(val a: Any) diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPackage.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPackage.kt index a09037ad1a3..3897e568624 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPackage.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPackage.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // has declaring class on Android 4.4 // IGNORE_BACKEND: ANDROID diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyDelegate.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyDelegate.kt index edb62fdde5a..51f89c02acf 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyDelegate.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyDelegate.kt @@ -1,5 +1,7 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS // WITH_STDLIB + package test class C { diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyGetter.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyGetter.kt index 0a65f28a4ba..5304ca3d1aa 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyGetter.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertyGetter.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT val l: Any diff --git a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertySetter.kt b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertySetter.kt index 575de45e021..130b5a8071d 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertySetter.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/lambdaInPropertySetter.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT var _l: Any = "" diff --git a/compiler/testData/codegen/box/reflection/enclosing/objectInLambda.kt b/compiler/testData/codegen/box/reflection/enclosing/objectInLambda.kt index b0f36c241b5..9795b7274c6 100644 --- a/compiler/testData/codegen/box/reflection/enclosing/objectInLambda.kt +++ b/compiler/testData/codegen/box/reflection/enclosing/objectInLambda.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM - +// LAMBDAS: CLASS // WITH_REFLECT fun box(): String { diff --git a/compiler/testData/codegen/box/reflection/genericSignature/functionLiteralGenericSignature.kt b/compiler/testData/codegen/box/reflection/genericSignature/functionLiteralGenericSignature.kt index 5f70c0e0333..25e70bf65a5 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/functionLiteralGenericSignature.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/functionLiteralGenericSignature.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: JVM +// LAMBDAS: CLASS import java.util.Date diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt b/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt index 358b6a8fb5c..741625e34c3 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt @@ -1,6 +1,7 @@ // TARGET_BACKEND: JVM // NO_CHECK_LAMBDA_INLINING // WITH_REFLECT +// LAMBDAS: CLASS // FILE: 1.kt package test diff --git a/compiler/testData/codegen/boxInline/signature/typeParameterInLambda.kt b/compiler/testData/codegen/boxInline/signature/typeParameterInLambda.kt index a7104afdefc..c54ac47de79 100644 --- a/compiler/testData/codegen/boxInline/signature/typeParameterInLambda.kt +++ b/compiler/testData/codegen/boxInline/signature/typeParameterInLambda.kt @@ -1,6 +1,7 @@ // WITH_REFLECT // FULL_JDK // NO_CHECK_LAMBDA_INLINING +// LAMBDAS: CLASS // TARGET_BACKEND: JVM // FILE: 1.kt package test diff --git a/compiler/testData/codegen/bytecodeText/companion/privateCompanionObjectAccessors_after.kt b/compiler/testData/codegen/bytecodeText/companion/privateCompanionObjectAccessors_after.kt index af71ced7add..ee733ebad00 100644 --- a/compiler/testData/codegen/bytecodeText/companion/privateCompanionObjectAccessors_after.kt +++ b/compiler/testData/codegen/bytecodeText/companion/privateCompanionObjectAccessors_after.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField +// LAMBDAS: CLASS class Host { private companion object { @@ -8,4 +9,4 @@ class Host { fun test() = { foo() } } -// 1 synthetic access\$ \ No newline at end of file +// 1 synthetic access\$ diff --git a/compiler/testData/codegen/bytecodeText/companion/protectedCompanionObjectAccessors_after.kt b/compiler/testData/codegen/bytecodeText/companion/protectedCompanionObjectAccessors_after.kt index f184e28d40f..a1d33528d48 100644 --- a/compiler/testData/codegen/bytecodeText/companion/protectedCompanionObjectAccessors_after.kt +++ b/compiler/testData/codegen/bytecodeText/companion/protectedCompanionObjectAccessors_after.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField - +// LAMBDAS: CLASS // FILE: Base.kt package a @@ -17,4 +17,4 @@ class Host : Base() { } // @Host.class: -// 1 synthetic access\$ \ No newline at end of file +// 1 synthetic access\$ diff --git a/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt b/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt index 3c8d43cec05..8c95872b680 100644 --- a/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt +++ b/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt @@ -1,3 +1,5 @@ +// LAMBDAS: CLASS + fun test() { fun local(){ diff --git a/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt b/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt index 680d4180464..25e660a4324 100644 --- a/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt +++ b/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt @@ -1,3 +1,5 @@ +// LAMBDAS: CLASS + fun test() { { val lam = {} diff --git a/compiler/testData/codegen/bytecodeText/kt10259.kt b/compiler/testData/codegen/bytecodeText/kt10259.kt index 6ae3b161407..d0eafb82d1c 100644 --- a/compiler/testData/codegen/bytecodeText/kt10259.kt +++ b/compiler/testData/codegen/bytecodeText/kt10259.kt @@ -1,3 +1,5 @@ +// LAMBDAS: CLASS + fun box(): String { var encl1 = "fail" var encl2 = "fail" diff --git a/compiler/testData/codegen/bytecodeText/kt9603.kt b/compiler/testData/codegen/bytecodeText/kt9603.kt index 306a93c2024..f14e4b5e2e8 100644 --- a/compiler/testData/codegen/bytecodeText/kt9603.kt +++ b/compiler/testData/codegen/bytecodeText/kt9603.kt @@ -1,3 +1,5 @@ +// LAMBDAS: CLASS + class A { public var prop = "O" private set @@ -9,4 +11,4 @@ class A { } // 0 INVOKESTATIC test\/A\.access\$getProp\$0 -// 1 INVOKEVIRTUAL A\.getProp \ No newline at end of file +// 1 INVOKEVIRTUAL A\.getProp diff --git a/compiler/testData/codegen/bytecodeText/outerClass/classInClinit.kt b/compiler/testData/codegen/bytecodeText/outerClass/classInClinit.kt index e8850d6b509..c1ffb8038a6 100644 --- a/compiler/testData/codegen/bytecodeText/outerClass/classInClinit.kt +++ b/compiler/testData/codegen/bytecodeText/outerClass/classInClinit.kt @@ -1,3 +1,4 @@ +// LAMBDAS: CLASS // FILE: test.kt // This should *not* have enclosing method . See https://youtrack.jetbrains.com/issue/KT-48754. diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index ca2c7ff2e77..5a2a5472f96 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -14001,12 +14001,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index aa9d9b3a54d..4e137677a25 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -14097,12 +14097,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index a24fa3ae20e..0bd3c954464 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -14097,12 +14097,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index 71b40241d95..28db62735e4 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -14097,12 +14097,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index e1228a52edb..22cac02ecb2 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -15482,12 +15482,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 04edc22a9a5..8ff3af8cc2f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -15844,12 +15844,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index f790dd63ddc..d56245d6336 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -15301,12 +15301,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index ddd9798f831..2d760fe2d3f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -15663,12 +15663,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @Test - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @Test @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java index 20eafdc1a4e..52d3c210363 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java @@ -12516,11 +12516,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/functions/functionNtoStringGeneric.kt"); } - @TestMetadata("functionNtoStringNoReflect.kt") - public void testFunctionNtoStringNoReflect() throws Exception { - runTest("compiler/testData/codegen/box/functions/functionNtoStringNoReflect.kt"); - } - @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { runTest("compiler/testData/codegen/box/functions/infixRecursiveCall.kt");