JVM_IR: discard parameter annotations in anonymous object constructors

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt

@@ -61,15 +61,11 @@ open class FunctionCodegen(
             )
         }
 
-        // FIXME: The following test is a workaround for a bug in anonymous object regeneration.
+        // Since the only arguments to anonymous object constructors are captured variables and complex
-        //        We currently need to avoid parameter annotations on the (synthetic) constructors of inlined anonymous objects,
+        // super constructor arguments, there shouldn't be any annotations on them other than @NonNull,
-        //        since otherwise anonymous object regeneration can fail with an ArrayIndexOutOfBounds exception if the number
+        // and those are meaningless on synthetic parameters. (Also, the inliner cannot handle them and
-        //        or arguments to the constructor changes.
+        // will throw an exception if we generate any.)
-        if (!hasSyntheticFlag ||
+        if (irFunction !is IrConstructor || (!hasSyntheticFlag && !irFunction.parentAsClass.isAnonymousObject)) {
-            irFunction.origin == JvmLoweredDeclarationOrigin.SYNTHETIC_METHOD_FOR_PROPERTY_ANNOTATIONS ||
-            //TODO: investigate this case: annotation here is generated twice in lowered function and in interface method overload
-            irFunction.origin == JvmLoweredDeclarationOrigin.GENERATED_SAM_IMPLEMENTATION
-        ) {
             generateParameterAnnotations(functionView, methodVisitor, signature, classCodegen, context)
         }
 

compiler/testData/codegen/box/closures/crossinlineLocalDeclaration.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // WITH_RUNTIME
 
 interface Wrapper { fun runBlock() }

compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalization.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // KOTLIN_CONFIGURATION_FLAGS: CONSTRUCTOR_CALL_NORMALIZATION_MODE=enable

compiler/testData/codegen/box/constructorCall/loopInInlineFunInSuperConstructorCallWithEnabledNormalizationSince13.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +NormalizeConstructorCalls
-// IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 open class A(val s: String)

compiler/testData/codegen/boxAgainstJava/inline/kt19910.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: J.java
 // FULL_JDK
 // WITH_RUNTIME

compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // FILE: 1.kt
 
 package test

compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // FILE: 1.kt
 
 package test

compiler/testData/codegen/boxInline/anonymousObject/kt13374.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // FILE: 1.kt
 
 package test

compiler/testData/codegen/boxInline/anonymousObject/kt16193.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 //WITH_RUNTIME
 //FULL_JDK

compiler/testData/codegen/boxInline/anonymousObject/kt19434.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 //WITH_RUNTIME

compiler/testData/codegen/boxInline/anonymousObject/kt19434_2.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 //WITH_RUNTIME

compiler/testData/codegen/boxInline/delegatedProperty/localInAnonymousObject.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // FILE: 1.kt
 package test
 

compiler/testData/codegen/boxInline/enclosingInfo/objectInInlineFun.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/reified/kt15997_2.kt

@@ -1,8 +1,6 @@
 // FILE: 1.kt
 // FULL_JDK
 // WITH_REFLECT
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 package test
 

compiler/testData/codegen/boxInline/signature/inProjectionSubstitution.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/signature/outProjectionSubstitution.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/signature/sameFormalParameterName.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/signature/sameReifiedFormalParameterName.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/signature/starProjectionSubstitution.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/signature/typeParametersSubstitution.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/signature/typeParametersSubstitution2.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: 1.kt
 // WITH_REFLECT

compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt

@@ -1,6 +1,6 @@
 // FILE: 1.kt
-// IGNORE_BACKEND: JVM_IR
+
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
+
 package builders
 //TODO there is a bug in asm it's skips linenumber on same line on reading bytecode
 inline fun call(crossinline init: () -> Unit) {

compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 //ALLOW_AST_ACCESS
 package test