JVM_IR: wrap performInline in enterIntoInlining/exitFromInliningOf

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

@@ -93,7 +93,13 @@ class IrInlineCodegen(
         expression: IrFunctionAccessExpression
     ) {
         val typeArguments = expression.descriptor.typeParameters.keysToMap { expression.getTypeArgumentOrDefault(it) }
-        performInline(typeArguments, callDefault, codegen)
+        // TODO port inlining cycle detection to IrFunctionAccessExpression & pass it
+        state.globalInlineContext.enterIntoInlining(null)
+        try {
+            performInline(typeArguments, callDefault, codegen)
+        } finally {
+            state.globalInlineContext.exitFromInliningOf(null)
+        }
     }
 
     private fun rememberClosure(irReference: IrFunctionReference, type: Type, parameter: IrValueParameter): LambdaInfo {

compiler/testData/codegen/box/casts/mutableCollections/safeAsWithMutable.kt

@@ -1,5 +1,4 @@
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND: JVM_IR
 // WITH_RUNTIME
 
 class Itr : Iterator<String> by ArrayList<String>().iterator()

compiler/testData/codegen/box/multiplatform/defaultArguments/inlineFunctionWithDefaultLambda.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND: JVM_IR
 // WITH_RUNTIME
 // FILE: common.kt
 

compiler/testData/codegen/box/statics/inlineCallsStaticMethod.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: Test.java

compiler/testData/codegen/box/topLevelPrivate/privateInInlineNested.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 package test
 
 private val prop = "O"

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 //WITH_RUNTIME
 // FILE: 1.kt
 class Foo {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: NATIVE
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/anonymousObject/sam/kt21671.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // FULL_JDK
 

compiler/testData/codegen/boxInline/anonymousObject/sam/kt21671_2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // FULL_JDK
 

compiler/testData/codegen/boxInline/anonymousObject/sam/kt21671_3.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // FULL_JDK
 

compiler/testData/codegen/boxInline/argumentOrder/captured.kt

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

compiler/testData/codegen/boxInline/argumentOrder/capturedInExtension.kt

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

compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 // WITH_RUNTIME

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReferenceOnInt.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundFunctionReferenceOnLong.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReferenceOnInt.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/boundPropertyReferenceOnLong.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/constuctorReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/differentInvokeSignature.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/differentInvokeSignature2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionImportedFromObject.kt

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

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/functionReferenceFromObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/innerClassConstuctorReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/privateFunctionReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyImportedFromObject.kt

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

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/callableReferences/propertyReferenceFromObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkLambdaClassIsPresent.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkLambdaClassesArePresent.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticLambdaClassIsPresent.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticLambdaClassesArePresent.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultCallInDefaultLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: bar$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/differentInvokeSignature.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/genericLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/instanceCapturedInClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21827.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: lParams$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // NO_CHECK_LAMBDA_INLINING
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt24477.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt25106.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt26636.kt

@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM_IR
 // WITH_RUNTIME
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: enumOrThrow$default

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/noInline.kt

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

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simple.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleErased.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleErasedStaticInstance.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleExtension.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleGeneric.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/simpleStaticInstance.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClash.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClashInClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 package test

compiler/testData/codegen/boxInline/defaultValues/varArgNoInline.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 //WITH_RUNTIME
 package test

compiler/testData/codegen/boxInline/innerClasses/innerLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: NATIVE
 // FILE: 1.kt
 // WITH_RUNTIME

compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.kt

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

compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.kt

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

compiler/testData/codegen/boxInline/multiplatform/defaultArguments/receiversAndParametersInLambda.kt

@@ -1,6 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
 // NO_CHECK_LAMBDA_INLINING
-// IGNORE_BACKEND: JVM_IR
 
 // FILE: 1.kt
 

compiler/testData/codegen/boxInline/noInline/extensionReceiver.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: 1.kt
 
 inline fun (() -> String).test(): (() -> String) = { invoke() + this.invoke() + this() }

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

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

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

@@ -1,5 +1,4 @@
 // FILE: 1.kt
-// IGNORE_BACKEND: JVM_IR
 package builders
 
 inline fun call(crossinline init: () -> Unit) {

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

@@ -1,5 +1,4 @@
 // FILE: 1.kt
-// IGNORE_BACKEND: JVM_IR
 package builders
 
 inline fun call(crossinline init: () -> Unit) {

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

@@ -1,5 +1,4 @@
 // FILE: 1.kt
-// IGNORE_BACKEND: JVM_IR
 package builders
 
 inline fun call(crossinline init: () -> Unit) {

compiler/testData/codegen/boxInline/smap/defaultFunction.kt

@@ -1,5 +1,4 @@
 // FILE: 1.kt
-// IGNORE_BACKEND: JVM_IR
 package test
 inline fun inlineFun(capturedParam: String, noinline lambda: () -> String = { capturedParam }): String {
     return lambda()

compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt

@@ -1,6 +1,5 @@
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: lParams$default
-// IGNORE_BACKEND: JVM_IR
 package test
 //A lot of blank lines [Don't delete]
 //A lot of blank lines [Don't delete]

compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt

@@ -1,6 +1,5 @@
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: lParams$default
-// IGNORE_BACKEND: JVM_IR
 package test
 //A lot of blank lines [Don't delete]
 //A lot of blank lines [Don't delete]

compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt

@@ -1,6 +1,5 @@
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: lParams$default
-// IGNORE_BACKEND: JVM_IR
 package test
 //A lot of blank lines [Don't delete]
 //A lot of blank lines [Don't delete]

compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt

@@ -1,6 +1,5 @@
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
-// IGNORE_BACKEND: JVM_IR
 
 package test
 inline fun inlineFun(capturedParam: String, crossinline lambda: () -> String = { capturedParam }): String {

compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt

@@ -1,6 +1,5 @@
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: inlineFun$default
-// IGNORE_BACKEND: JVM_IR
 
 package test
 inline fun inlineFun(capturedParam: String, lambda: () -> String = { capturedParam }): String {

compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt

@@ -1,6 +1,5 @@
 // FILE: 1.kt
 // SKIP_INLINE_CHECK_IN: lParams$default
-// IGNORE_BACKEND: JVM_IR
 package test
 //A lot of blank lines [Don't delete]
 //A lot of blank lines [Don't delete]