azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR] Don't render facade classes in JVM fq-names in irText tests

Browse Source 
This makes the tests more compatible with non-JVM backends
(see KT-58605)
This commit is contained in:
Sergej Jaskiewicz
2023-05-10 17:46:12 +02:00
committed by Space Team
parent a5e0a937d6
commit 56f977f70c
62 changed files with 257 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt
Vendored
+6 -6
View File
@@ -123,16 +123,16 @@ FILE fqName:<root> fileName:/ClashResolutionDescriptor.kt
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
PROPERTY name:registrationMap visibility:private modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } visibility:private [final,static]
FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } visibility:private [final,static]
EXPRESSION_BODY
CALL 'public final fun hashMapOf <K, V> (): java.util.HashMap<K of kotlin.collections.MapsKt.hashMapOf, V of kotlin.collections.MapsKt.hashMapOf>{ kotlin.collections.TypeAliasesKt.HashMap<K of kotlin.collections.MapsKt.hashMapOf, V of kotlin.collections.MapsKt.hashMapOf> } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } origin=null
CALL 'public final fun hashMapOf <K, V> (): java.util.HashMap<K of kotlin.collections.MapsKt.hashMapOf, V of kotlin.collections.MapsKt.hashMapOf>{ kotlin.collections.HashMap<K of kotlin.collections.MapsKt.hashMapOf, V of kotlin.collections.MapsKt.hashMapOf> } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } origin=null
<K>: java.lang.reflect.Type
<V>: kotlin.Any
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-registrationMap> visibility:private modality:FINAL <> () returnType:java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> }
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-registrationMap> visibility:private modality:FINAL <> () returnType:java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> }
correspondingProperty: PROPERTY name:registrationMap visibility:private modality:FINAL [val]
BLOCK_BODY
RETURN type=kotlin.Nothing from='private final fun <get-registrationMap> (): java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } visibility:private [final,static]' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } origin=null
RETURN type=kotlin.Nothing from='private final fun <get-registrationMap> (): java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } visibility:private [final,static]' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } origin=null
FUN name:resolveClashesIfAny visibility:public modality:FINAL <> (container:<root>.ComponentContainer, clashResolvers:kotlin.collections.List<<root>.PlatformExtensionsClashResolver<*>>) returnType:kotlin.Unit
VALUE_PARAMETER name:container index:0 type:<root>.ComponentContainer
VALUE_PARAMETER name:clashResolvers index:1 type:kotlin.collections.List<<root>.PlatformExtensionsClashResolver<*>>
@@ -154,7 +154,7 @@ FILE fqName:<root> fileName:/ClashResolutionDescriptor.kt
VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.collections.Collection<<root>.ComponentDescriptor>? [val]
TYPE_OP type=kotlin.collections.Collection<<root>.ComponentDescriptor>? origin=SAFE_CAST typeOperand=kotlin.collections.Collection<<root>.ComponentDescriptor>
CALL 'public open fun get (key: @[EnhancedNullability] K of java.util.HashMap): @[EnhancedNullability] V of java.util.HashMap? [operator] declared in java.util.HashMap' type=@[EnhancedNullability] kotlin.Any? origin=GET_ARRAY_ELEMENT
$this: CALL 'private final fun <get-registrationMap> (): java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } declared in <root>' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.TypeAliasesKt.HashMap<java.lang.reflect.Type, kotlin.Any> } origin=GET_PROPERTY
$this: CALL 'private final fun <get-registrationMap> (): java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } declared in <root>' type=java.util.HashMap<java.lang.reflect.Type, kotlin.Any>{ kotlin.collections.HashMap<java.lang.reflect.Type, kotlin.Any> } origin=GET_PROPERTY
key: CALL 'public final fun <get-applicableTo> (): java.lang.Class<E of <root>.PlatformExtensionsClashResolver> declared in <root>.PlatformExtensionsClashResolver' type=java.lang.Class<out <root>.PlatformSpecificExtension<*>> origin=GET_PROPERTY
$this: GET_VAR 'val resolver: <root>.PlatformExtensionsClashResolver<*> [val] declared in <root>.resolveClashesIfAny' type=<root>.PlatformExtensionsClashResolver<*> origin=null
WHEN type=kotlin.collections.Collection<<root>.ComponentDescriptor> origin=null
compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt
Vendored
+4 -4
View File
@@ -36,9 +36,9 @@ FILE fqName:<root> fileName:/coercionToUnitForNestedWhen.kt
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public open fun toChar (): kotlin.Char declared in kotlin.Int' type=kotlin.Char origin=null
$this: GET_VAR 'val tmp_0: kotlin.Int? [val] declared in <root>.nextChar' type=kotlin.Int? origin=null
FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder }, quote:kotlin.Char) returnType:kotlin.Unit
FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder{ kotlin.text.StringBuilder }, quote:kotlin.Char) returnType:kotlin.Unit
$receiver: VALUE_PARAMETER name:<this> type:java.io.Reader
VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder }
VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder{ kotlin.text.StringBuilder }
VALUE_PARAMETER name:quote index:1 type:kotlin.Char
BLOCK_BODY
VAR name:ch type:kotlin.Char? [var]
@@ -87,13 +87,13 @@ FILE fqName:<root> fileName:/coercionToUnitForNestedWhen.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in <root>.consumeRestOfQuotedSequence'
CALL 'public open fun append (p0: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in java.lang.StringBuilder' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null
$this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } origin=null
$this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null
p0: GET_VAR 'it: kotlin.Char declared in <root>.consumeRestOfQuotedSequence.<anonymous>' type=kotlin.Char origin=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
CALL 'public open fun append (p0: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in java.lang.StringBuilder' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null
$this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } origin=null
$this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in <root>.consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null
p0: GET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Char? origin=null
SET_VAR 'var ch: kotlin.Char? [var] declared in <root>.consumeRestOfQuotedSequence' type=kotlin.Unit origin=EQ
CALL 'private final fun nextChar (): kotlin.Char? declared in <root>' type=kotlin.Char? origin=null
compiler/testData/ir/irText/firProblems/kt55458.fir.ir.txt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/kt55458.kt
FUN name:main visibility:public modality:FINAL <> () returnType:kotlin.Unit
BLOCK_BODY
VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Pair<kotlin.Int, kotlin.Int> [val]
CALL 'public final fun to <A, B> (that: B of kotlin.TuplesKt.to): kotlin.Pair<A of kotlin.TuplesKt.to, B of kotlin.TuplesKt.to> [infix] declared in kotlin.TuplesKt' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
CALL 'public final fun to <A, B> (that: B of kotlin.to): kotlin.Pair<A of kotlin.to, B of kotlin.to> [infix] declared in kotlin' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
<A>: kotlin.Int
<B>: kotlin.Int
$receiver: CONST Int type=kotlin.Int value=1
@@ -10,5 +10,5 @@ FILE fqName:<root> fileName:/kt55458.kt
VAR name:a type:kotlin.Int [val]
CALL 'public final fun component1 (): A of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.Int origin=COMPONENT_N(index=1)
$this: GET_VAR 'val tmp_0: kotlin.Pair<kotlin.Int, kotlin.Int> [val] declared in <root>.main' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
message: GET_VAR 'val a: kotlin.Int [val] declared in <root>.main' type=kotlin.Int origin=null
compiler/testData/ir/irText/firProblems/kt55458.ir.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ FILE fqName:<root> fileName:/kt55458.kt
BLOCK_BODY
COMPOSITE type=kotlin.Unit origin=DESTRUCTURING_DECLARATION
VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Pair<kotlin.Int, kotlin.Int> [val]
CALL 'public final fun to <A, B> (that: B of kotlin.TuplesKt.to): kotlin.Pair<A of kotlin.TuplesKt.to, B of kotlin.TuplesKt.to> [infix] declared in kotlin.TuplesKt' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
CALL 'public final fun to <A, B> (that: B of kotlin.to): kotlin.Pair<A of kotlin.to, B of kotlin.to> [infix] declared in kotlin' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
<A>: kotlin.Int
<B>: kotlin.Int
$receiver: CONST Int type=kotlin.Int value=1
@@ -11,5 +11,5 @@ FILE fqName:<root> fileName:/kt55458.kt
VAR name:a type:kotlin.Int [val]
CALL 'public final fun component1 (): A of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.Int origin=COMPONENT_N(index=1)
$this: GET_VAR 'val tmp_0: kotlin.Pair<kotlin.Int, kotlin.Int> [val] declared in <root>.main' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
message: GET_VAR 'val a: kotlin.Int [val] declared in <root>.main' type=kotlin.Int origin=null
compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt
Vendored
+1 -1
View File
@@ -48,7 +48,7 @@ FILE fqName:<root> fileName:/lambdaInEnumEntryConstructorCall.kt
VALUE_PARAMETER name:value index:0 type:kotlin.String
VALUE_PARAMETER name:nc index:1 type:<root>.Wrapper
BLOCK_BODY
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
message: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt
Vendored
+1 -1
View File
@@ -48,7 +48,7 @@ FILE fqName:<root> fileName:/lambdaInEnumEntryConstructorCall.kt
VALUE_PARAMETER name:value index:0 type:kotlin.String
VALUE_PARAMETER name:nc index:1 type:<root>.Wrapper
BLOCK_BODY
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
message: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
$this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.fir.ir.txt
Vendored
+2 -2
View File
@@ -32,12 +32,12 @@ FILE fqName:<root> fileName:/reflectFindAnnotationOnDefaultMethodParameter.kt
CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.box.<no name provided>' type=<root>.box.<no name provided> origin=OBJECT_LITERAL
VAR name:method type:@[FlexibleNullability] java.lang.reflect.Method? [val]
CALL 'public open fun getMethod (p0: @[FlexibleNullability] kotlin.String?, vararg p1: @[FlexibleNullability] java.lang.Class<*>?): @[FlexibleNullability] java.lang.reflect.Method? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Method? origin=null
$this: CALL 'public final fun <get-javaClass> <T> (): java.lang.Class<T of kotlin.jvm.JvmClassMappingKt.<get-javaClass>> [inline] declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<<root>.box.<no name provided>> origin=GET_PROPERTY
$this: CALL 'public final fun <get-javaClass> <T> (): java.lang.Class<T of kotlin.jvm.<get-javaClass>> [inline] declared in kotlin.jvm' type=java.lang.Class<<root>.box.<no name provided>> origin=GET_PROPERTY
<T>: <root>.box.<no name provided>
$receiver: GET_VAR 'val impl: <root>.box.<no name provided> [val] declared in <root>.box' type=<root>.box.<no name provided> origin=null
p0: CONST String type=kotlin.String value="m"
p1: VARARG type=@[FlexibleNullability] kotlin.Array<out @[FlexibleNullability] java.lang.Class<*>?>? varargElementType=@[FlexibleNullability] java.lang.Class<*>?
CALL 'public final fun <get-java> <T> (): java.lang.Class<T of kotlin.jvm.JvmClassMappingKt.<get-java>> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<kotlin.String> origin=GET_PROPERTY
CALL 'public final fun <get-java> <T> (): java.lang.Class<T of kotlin.jvm.<get-java>> declared in kotlin.jvm' type=java.lang.Class<kotlin.String> origin=GET_PROPERTY
<T>: kotlin.String
$receiver: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:String modality:FINAL visibility:public superTypes:[kotlin.Comparable<kotlin.String>; kotlin.CharSequence; java.io.Serializable]' type=kotlin.reflect.KClass<kotlin.String>
VAR name:parameter type:@[FlexibleNullability] java.lang.reflect.Parameter? [val]
compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.ir.txt
Vendored
+2 -2
View File
@@ -32,12 +32,12 @@ FILE fqName:<root> fileName:/reflectFindAnnotationOnDefaultMethodParameter.kt
CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.box.<no name provided>' type=<root>.box.<no name provided> origin=OBJECT_LITERAL
VAR name:method type:@[FlexibleNullability] java.lang.reflect.Method? [val]
CALL 'public open fun getMethod (p0: @[FlexibleNullability] kotlin.String?, vararg p1: @[FlexibleNullability] java.lang.Class<*>?): @[FlexibleNullability] java.lang.reflect.Method? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Method? origin=null
$this: CALL 'public final fun <get-javaClass> <T> (): java.lang.Class<T of kotlin.jvm.JvmClassMappingKt.<get-javaClass>> [inline] declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<<root>.box.<no name provided>> origin=GET_PROPERTY
$this: CALL 'public final fun <get-javaClass> <T> (): java.lang.Class<T of kotlin.jvm.<get-javaClass>> [inline] declared in kotlin.jvm' type=java.lang.Class<<root>.box.<no name provided>> origin=GET_PROPERTY
<T>: <root>.box.<no name provided>
$receiver: GET_VAR 'val impl: <root>.box.<no name provided> [val] declared in <root>.box' type=<root>.box.<no name provided> origin=null
p0: CONST String type=kotlin.String value="m"
p1: VARARG type=kotlin.Array<out @[FlexibleNullability] java.lang.Class<*>?>? varargElementType=@[FlexibleNullability] java.lang.Class<*>?
CALL 'public final fun <get-java> <T> (): java.lang.Class<T of kotlin.jvm.JvmClassMappingKt.<get-java>> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<kotlin.String> origin=GET_PROPERTY
CALL 'public final fun <get-java> <T> (): java.lang.Class<T of kotlin.jvm.<get-java>> declared in kotlin.jvm' type=java.lang.Class<kotlin.String> origin=GET_PROPERTY
<T>: kotlin.String
$receiver: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:String modality:FINAL visibility:public superTypes:[kotlin.Comparable<kotlin.String>; kotlin.CharSequence; java.io.Serializable]' type=kotlin.reflect.KClass<kotlin.String>
VAR name:parameter type:@[FlexibleNullability] java.lang.reflect.Parameter? [val]