diff --git a/compiler/testData/ir/irText/classes/kt45853__AX.ir.txt b/compiler/testData/ir/irText/classes/kt45853.__AX.ir.txt similarity index 100% rename from compiler/testData/ir/irText/classes/kt45853__AX.ir.txt rename to compiler/testData/ir/irText/classes/kt45853.__AX.ir.txt diff --git a/compiler/testData/ir/irText/classes/kt45853__X.ir.txt b/compiler/testData/ir/irText/classes/kt45853.__X.ir.txt similarity index 100% rename from compiler/testData/ir/irText/classes/kt45853__X.ir.txt rename to compiler/testData/ir/irText/classes/kt45853.__X.ir.txt diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall__J1.ir.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.__J1.ir.txt similarity index 100% rename from compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall__J1.ir.txt rename to compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.__J1.ir.txt diff --git a/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.kt b/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.kt index 3cd68aee830..c11a948ce9f 100644 --- a/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.kt +++ b/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// !DUMP_DEPENDENCIES fun with1(receiver: Any?, block: Any?.() -> Unit) = block(receiver) -fun with2(receiver: Any?, block: Any?.() -> Unit) = receiver.block() \ No newline at end of file +fun with2(receiver: Any?, block: Any?.() -> Unit) = receiver.block() diff --git a/compiler/testData/ir/irText/stubs/builtinMap.kt b/compiler/testData/ir/irText/stubs/builtinMap.kt index b97eea7180b..7a64458ccfd 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap.kt +++ b/compiler/testData/ir/irText/stubs/builtinMap.kt @@ -1,6 +1,5 @@ -// !DUMP_DEPENDENCIES // WITH_STDLIB // FULL_JDK fun Map.plus(pair: Pair): Map = - if (this.isEmpty()) mapOf(pair) else LinkedHashMap(this).apply { put(pair.first, pair.second) } \ No newline at end of file + if (this.isEmpty()) mapOf(pair) else LinkedHashMap(this).apply { put(pair.first, pair.second) } diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins__kotlin.Int.ir.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.ir.txt similarity index 100% rename from compiler/testData/ir/irText/stubs/constFromBuiltins__kotlin.Int.ir.txt rename to compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.ir.txt diff --git a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters__J1.ir.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.__J1.ir.txt similarity index 100% rename from compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters__J1.ir.txt rename to compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.__J1.ir.txt diff --git a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt new file mode 100644 index 00000000000..62715c1dfe2 --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt @@ -0,0 +1,57 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB ENUM_CLASS name:JEnum modality:FINAL visibility:public superTypes:[<.JEnum?>] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.JEnum + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.JEnum [primary] + ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:ONE + ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:TWO + ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:THREE + FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:<.JEnum?>) returnType: [fake_override] + overridden: + protected final fun clone (): declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.JEnum?>, other:.JEnum?) returnType: [fake_override,operator] + overridden: + public final fun compareTo (other: ): [operator] declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:.JEnum? + FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<.JEnum?>, other:?) returnType: [fake_override,operator] + overridden: + public final fun equals (other: ?): [operator] declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<.JEnum?>) returnType: [fake_override] + overridden: + public final fun hashCode (): declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<.JEnum?>) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.JEnum?>) returnType:<.JEnum?>? [fake_override] + overridden: + public final fun getDeclaringClass (): <?>? declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<.JEnum?>) returnType: [fake_override] + overridden: + protected/*protected and package*/ final fun finalize (): declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:name visibility:public modality:FINAL [fake_override,val] + annotations: + + overridden: + public final name: [val] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum<.JEnum?>) returnType: [fake_override] + correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:name visibility:public modality:FINAL [fake_override,val] + overridden: + public final fun (): declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ordinal visibility:public modality:FINAL [fake_override,val] + overridden: + public final ordinal: [val] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum<.JEnum?>) returnType: [fake_override] + correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ordinal visibility:public modality:FINAL [fake_override,val] + overridden: + public final fun (): declared in kotlin.Enum + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Enum<.JEnum?> + FUN IR_EXTERNAL_DECLARATION_STUB name:valueOf visibility:public modality:FINAL <> (value:) returnType:.JEnum + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:value index:0 type: + FUN IR_EXTERNAL_DECLARATION_STUB name:values visibility:public modality:FINAL <> () returnType:<.JEnum> diff --git a/compiler/testData/ir/irText/stubs/javaEnum.kt b/compiler/testData/ir/irText/stubs/javaEnum.kt index a17bb5ebf43..80079470c99 100644 --- a/compiler/testData/ir/irText/stubs/javaEnum.kt +++ b/compiler/testData/ir/irText/stubs/javaEnum.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: JEnum // FILE: JEnum.java public enum JEnum { @@ -8,4 +8,4 @@ public enum JEnum { // FILE: javaEnum.kt -val test = JEnum.ONE \ No newline at end of file +val test = JEnum.ONE diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.__J.ir.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.__J.ir.txt new file mode 100644 index 00000000000..3ed05f953ca --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaInnerClass.__J.ir.txt @@ -0,0 +1,41 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:J modality:OPEN visibility:public superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.J [primary] + CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:JInner modality:OPEN visibility:public [inner] superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J.JInner + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> ($this:.J) returnType:.J.JInner [primary] + $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:, other:?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: ?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:foo visibility:public modality:OPEN <> ($this:.J.JInner) returnType: + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J.JInner + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:z visibility:public modality:FINAL [var] + FIELD IR_EXTERNAL_DECLARATION_STUB name:z type: visibility:public + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:.J) returnType: + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:x visibility:public modality:FINAL [var] + FIELD IR_EXTERNAL_DECLARATION_STUB name:x type: visibility:public diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.kt b/compiler/testData/ir/irText/stubs/javaInnerClass.kt index 3272937d2f1..103c672326d 100644 --- a/compiler/testData/ir/irText/stubs/javaInnerClass.kt +++ b/compiler/testData/ir/irText/stubs/javaInnerClass.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: J // FILE: J.java public class J { diff --git a/compiler/testData/ir/irText/stubs/javaMethod.__J.ir.txt b/compiler/testData/ir/irText/stubs/javaMethod.__J.ir.txt new file mode 100644 index 00000000000..8c9b4f997cc --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaMethod.__J.ir.txt @@ -0,0 +1,18 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:J modality:OPEN visibility:public superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.J [primary] + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:, other:?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: ?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:.J) returnType: + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J diff --git a/compiler/testData/ir/irText/stubs/javaMethod.kt b/compiler/testData/ir/irText/stubs/javaMethod.kt index cd3d66594bf..3972b9a65af 100644 --- a/compiler/testData/ir/irText/stubs/javaMethod.kt +++ b/compiler/testData/ir/irText/stubs/javaMethod.kt @@ -1,6 +1,6 @@ // TARGET_BACKEND: JVM // FIR_IDENTICAL -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: J // FILE: J.java public class J { diff --git a/compiler/testData/ir/irText/stubs/javaNestedClass.__J.ir.txt b/compiler/testData/ir/irText/stubs/javaNestedClass.__J.ir.txt new file mode 100644 index 00000000000..725526e4dc1 --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaNestedClass.__J.ir.txt @@ -0,0 +1,35 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:J modality:OPEN visibility:public superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.J [primary] + CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:JJ modality:OPEN visibility:public superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J.JJ + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.J.JJ [primary] + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:, other:?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: ?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:foo visibility:public modality:OPEN <> ($this:.J.JJ) returnType: + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J.JJ + FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> () returnType: + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/stubs/javaNestedClass.kt b/compiler/testData/ir/irText/stubs/javaNestedClass.kt index 6094f5c2281..6ce52e74922 100644 --- a/compiler/testData/ir/irText/stubs/javaNestedClass.kt +++ b/compiler/testData/ir/irText/stubs/javaNestedClass.kt @@ -1,6 +1,6 @@ // TARGET_BACKEND: JVM // FIR_IDENTICAL -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: J // FILE: J.java public class J { diff --git a/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.ir.txt b/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.ir.txt new file mode 100644 index 00000000000..1636d20faab --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.ir.txt @@ -0,0 +1,17 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:J modality:OPEN visibility:public superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.J [primary] + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:, other:?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: ?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> () returnType: diff --git a/compiler/testData/ir/irText/stubs/javaStaticMethod.kt b/compiler/testData/ir/irText/stubs/javaStaticMethod.kt index f6555c3a2b6..3dee7b7d4dc 100644 --- a/compiler/testData/ir/irText/stubs/javaStaticMethod.kt +++ b/compiler/testData/ir/irText/stubs/javaStaticMethod.kt @@ -1,6 +1,6 @@ // TARGET_BACKEND: JVM // FIR_IDENTICAL -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: J // FILE: J.java public class J { diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.ir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.ir.txt new file mode 100644 index 00000000000..05c8b18fe33 --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.ir.txt @@ -0,0 +1,18 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:J modality:OPEN visibility:public/*package*/ superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public/*package*/ <> () returnType:.J [primary] + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:, other:?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: ?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:getFoo visibility:public modality:OPEN <> ($this:.J) returnType:? + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.J diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt index 25f3f769e39..d1a49b2f37c 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt @@ -1,10 +1,10 @@ // TARGET_BACKEND: JVM // FIR_IDENTICAL -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: J // FILE: javaSyntheticProperty.kt val test = J().foo // FILE: J.java class J { public String getFoo() { return null; } -} \ No newline at end of file +} diff --git a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.kt b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.kt index d2d79d6800d..856146ea25d 100644 --- a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.kt +++ b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.kt @@ -1,3 +1,2 @@ // TARGET_BACKEND: JVM -// !DUMP_DEPENDENCIES val Class<*>.test get() = this.declaredFields diff --git a/compiler/testData/ir/irText/stubs/kotlinInnerClass.__Outer.ir.txt b/compiler/testData/ir/irText/stubs/kotlinInnerClass.__Outer.ir.txt new file mode 100644 index 00000000000..f88b88eebe6 --- /dev/null +++ b/compiler/testData/ir/irText/stubs/kotlinInnerClass.__Outer.ir.txt @@ -0,0 +1,37 @@ +CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Outer modality:FINAL visibility:public superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.Outer + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:.Outer [primary] + CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[] + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.Outer.Inner + CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> ($this:.Outer) returnType:.Outer.Inner [primary] + $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.Outer + FUN IR_EXTERNAL_DECLARATION_STUB name:foo visibility:public modality:FINAL <> ($this:.Outer.Inner) returnType: + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.Outer.Inner + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:, other:?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: ?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:FINAL <> ($this:.Outer) returnType: + $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:.Outer + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType: [fake_override,operator] + overridden: + public open fun equals (other: kotlin.Any?): [operator] declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun hashCode (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType: [fake_override] + overridden: + public open fun toString (): declared in kotlin.Any + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/stubs/kotlinInnerClass.kt b/compiler/testData/ir/irText/stubs/kotlinInnerClass.kt index f63f02bef84..1e752b74f19 100644 --- a/compiler/testData/ir/irText/stubs/kotlinInnerClass.kt +++ b/compiler/testData/ir/irText/stubs/kotlinInnerClass.kt @@ -1,5 +1,5 @@ // FIR_IDENTICAL -// !DUMP_DEPENDENCIES +// DUMP_EXTERNAL_CLASS: Outer // FILE: external.kt // EXTERNAL_FILE diff --git a/compiler/testData/ir/irText/stubs/simple.kt b/compiler/testData/ir/irText/stubs/simple.kt index 0178645a003..a8b4361cc3b 100644 --- a/compiler/testData/ir/irText/stubs/simple.kt +++ b/compiler/testData/ir/irText/stubs/simple.kt @@ -1,4 +1,3 @@ // FIR_IDENTICAL -// !DUMP_DEPENDENCIES -val test = 2 + 2 \ No newline at end of file +val test = 2 + 2 diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt index 70256c3a85d..de4a2d382fd 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt @@ -99,7 +99,7 @@ class IrTextDumpHandler(testServices: TestServices) : AbstractIrHandler(testServ val baseFile = testServices.moduleStructure.originalTestDataFiles.first() for (externalClassFqn in externalClassFqns) { val classDump = stubGenerator.generateExternalClass(irModule.descriptor, externalClassFqn).dump() - val expectedFile = baseFile.withSuffixAndExtension("__$externalClassFqn", module.dumpExtension) + val expectedFile = baseFile.withSuffixAndExtension(".__$externalClassFqn", module.dumpExtension) assertions.assertEqualsToFile(expectedFile, classDump) } }