diff --git a/compiler/testData/codegen/box/collections/specialBridgeForGet.kt b/compiler/testData/codegen/box/collections/specialBridgeForGet.kt index 9c854c672c1..a46d7aa14fa 100644 --- a/compiler/testData/codegen/box/collections/specialBridgeForGet.kt +++ b/compiler/testData/codegen/box/collections/specialBridgeForGet.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370 // WITH_STDLIB // FULL_JDK diff --git a/compiler/testData/codegen/box/fir/CustomHashSetSize.kt b/compiler/testData/codegen/box/fir/CustomHashSetSize.kt index 410552c2eac..c09659171c2 100644 --- a/compiler/testData/codegen/box/fir/CustomHashSetSize.kt +++ b/compiler/testData/codegen/box/fir/CustomHashSetSize.kt @@ -2,7 +2,6 @@ // IGNORE_BACKEND_K2: JVM_IR // ISSUE: KT-61941 // WITH_STDLIB -// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370 // MODULE: m1 // FILE: m1/THash.java diff --git a/compiler/testData/codegen/boxInline/signature/byteIteratorWithForLoop.kt b/compiler/testData/codegen/boxInline/signature/byteIteratorWithForLoop.kt index 0f0a2628d31..3ed7ae7ec6d 100644 --- a/compiler/testData/codegen/boxInline/signature/byteIteratorWithForLoop.kt +++ b/compiler/testData/codegen/boxInline/signature/byteIteratorWithForLoop.kt @@ -1,6 +1,4 @@ // TARGET_BACKEND: JVM -// IGNORE_BACKEND_K2: JVM_IR -// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE // ALLOW_KOTLIN_PACKAGE // Note: order of files is important diff --git a/compiler/testData/codegen/boxInline/signature/byteIteratorWithWhileLoop.kt b/compiler/testData/codegen/boxInline/signature/byteIteratorWithWhileLoop.kt index 05a1b5fbbce..a08baf183dc 100644 --- a/compiler/testData/codegen/boxInline/signature/byteIteratorWithWhileLoop.kt +++ b/compiler/testData/codegen/boxInline/signature/byteIteratorWithWhileLoop.kt @@ -1,6 +1,4 @@ // TARGET_BACKEND: JVM -// IGNORE_BACKEND_K2: JVM_IR -// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE // ALLOW_KOTLIN_PACKAGE // Note: order of files is important diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.kt b/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.kt index a93fc78aeab..a8ce4efac64 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.kt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/specialBridgeForGet.kt @@ -2,9 +2,6 @@ // WITH_STDLIB // FULL_JDK -// IGNORE_BACKEND_K2: JVM_IR -// FIR status: KT-57301 K2: `getOrDefault` and bridges are not generated for certain Map subclasses - abstract class AMap1(private val m: Map) : Map by m interface Value2 diff --git a/compiler/testData/codegen/script/destructuringDeclaration.fir.ir.txt b/compiler/testData/codegen/script/destructuringDeclaration.fir.ir.txt index 0f90b36b49a..3d1579ea1f3 100644 --- a/compiler/testData/codegen/script/destructuringDeclaration.fir.ir.txt +++ b/compiler/testData/codegen/script/destructuringDeclaration.fir.ir.txt @@ -9,28 +9,28 @@ FILE fqName: fileName:/destructuringDeclaration.kts SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:def type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null value: CALL 'public final fun component2 (): kotlin.Int declared in ..A' type=kotlin.Int origin=COMPONENT_N(index=2) $this: GET_VAR 'val tmp_0: ..A declared in .' type=..A origin=null - PROPERTY name:abc visibility:public modality:FINAL [val] + PROPERTY SCRIPT_K2 name:abc visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:abc type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int - correspondingProperty: PROPERTY name:abc visibility:public modality:FINAL [val] + correspondingProperty: PROPERTY SCRIPT_K2 name:abc visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .' GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:abc type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null - PROPERTY name:def visibility:public modality:FINAL [val] + PROPERTY SCRIPT_K2 name:def visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:def type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int - correspondingProperty: PROPERTY name:def visibility:public modality:FINAL [val] + correspondingProperty: PROPERTY SCRIPT_K2 name:def visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .' GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:def type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null - PROPERTY name:rv visibility:public modality:FINAL [val] + PROPERTY SCRIPT_K2 name:rv visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:rv type:kotlin.Int visibility:private [final] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=PLUS $this: CALL 'public final fun (): kotlin.Int declared in .' type=kotlin.Int origin=GET_PROPERTY other: CALL 'public final fun (): kotlin.Int declared in .' type=kotlin.Int origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int - correspondingProperty: PROPERTY name:rv visibility:public modality:FINAL [val] + correspondingProperty: PROPERTY SCRIPT_K2 name:rv visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .' GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:rv type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt index 3619298b69c..0e66fb047af 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.fir.kt @@ -7,9 +7,9 @@ interface J expect class Foo : I, C, J -expect class Bar : C() +expect class Bar : C() -expect class WithExplicitPrimaryConstructor() : C() +expect class WithExplicitPrimaryConstructor() : C() // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt