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

Fir2Ir: apply major text data update after a bunch of resolve changes

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-26 13:07:09 +03:00
parent 3e51cbc9dc
commit 5262f0a53f
262 changed files with 1776 additions and 1636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/stubs/builtinMap.fir.txt
Vendored
+9 -8
View File
@@ -12,12 +12,13 @@ FILE fqName:<root> fileName:/builtinMap.kt
GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun apply (block: kotlin.Function1<T of <uninitialized parent>, kotlin.Unit>): T of <uninitialized parent> [inline] declared in kotlin' type=T of <uninitialized parent> origin=null
block: BLOCK type=IrErrorType origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType
then: CALL 'public final fun apply (block: kotlin.Function1<T of <uninitialized parent>, kotlin.Unit>): T of <uninitialized parent> [inline] declared in kotlin' type=java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus> origin=null
block: BLOCK type=kotlin.Unit origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>) returnType:kotlin.Unit
VALUE_PARAMETER name:it index:0 type:java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>
BLOCK_BODY
RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.plus'
ERROR_CALL 'Unresolved reference: <Unresolved name: put>#' type=IrErrorType
ERROR_CALL 'Unresolved reference: <Unresolved name: first>#' type=IrErrorType
ERROR_CALL 'Unresolved reference: <Unresolved name: second>#' type=IrErrorType
FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.plus' type=IrErrorType origin=LAMBDA
ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [java/util/HashMap.put]>#' type=IrErrorType
ERROR_CALL 'No getter found for R|kotlin/Pair.first|' type=A of <uninitialized parent>
ERROR_CALL 'No getter found for R|kotlin/Pair.second|' type=B of <uninitialized parent>
FUNCTION_REFERENCE 'local final fun <anonymous> (it: java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>): kotlin.Unit declared in <root>.plus' type=kotlin.Unit origin=LAMBDA
compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt
Vendored
+6 -5
View File
@@ -1,10 +1,11 @@
FILE fqName:<root> fileName:/constFromBuiltins.kt
PROPERTY name:test visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static]
FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static]
EXPRESSION_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: MIN_VALUE>#' type=IrErrorType
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:IrErrorType
ERROR_CALL 'No getter found for R|kotlin/Int.Companion.MIN_VALUE|' type=kotlin.Int
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
RETURN type=kotlin.Nothing from='public final fun <get-test> (): kotlin.Int declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.fir.txt
Vendored
+4 -3
View File
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m1.kt
CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
TYPE_PARAMETER name:T index:0 variance: superTypes:[]
CONSTRUCTOR visibility:public <> (x:T of <root>.Base) returnType:<root>.Base<T of <root>.Base> [primary]
VALUE_PARAMETER name:x index:0 type:T of <root>.Base
CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Base<T of <uninitialized parent>> [primary]
VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent>
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
PROPERTY name:x visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Base visibility:public [final]
EXPRESSION_BODY
GET_VAR 'x: T of <root>.Base declared in <root>.Base.<init>' type=T of <root>.Base origin=INITIALIZE_PROPERTY_FROM_PARAMETER
GET_VAR 'x: T of <uninitialized parent> declared in <root>.Base.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:T of <root>.Base
correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
$this: VALUE_PARAMETER name:<this> type:<root>.Base
@@ -51,3 +51,4 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m1.kt
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt
Vendored
+7 -6
View File
@@ -2,11 +2,11 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
CLASS CLASS name:Derived1 modality:FINAL visibility:public superTypes:[<root>.Base<T of <root>.Derived1>]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived1
TYPE_PARAMETER name:T index:0 variance: superTypes:[]
CONSTRUCTOR visibility:public <> (x:T of <root>.Derived1) returnType:<root>.Derived1<T of <root>.Derived1> [primary]
VALUE_PARAMETER name:x index:0 type:T of <root>.Derived1
CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Derived1<T of <uninitialized parent>> [primary]
VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent>
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Base) [primary] declared in <root>.Base'
x: GET_VAR 'x: T of <root>.Derived1 declared in <root>.Derived1.<init>' type=T of <root>.Derived1 origin=null
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: T of <uninitialized parent>) [primary] declared in <root>.Base'
x: GET_VAR 'x: T of <uninitialized parent> declared in <root>.Derived1.<init>' type=T of <uninitialized parent> origin=null
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived1 modality:FINAL visibility:public superTypes:[<root>.Base<T of <root>.Derived1>]'
FUN name:foo visibility:public modality:FINAL <Y> ($this:<root>.Derived1, y:Y of <root>.Derived1.foo) returnType:T of <root>.Derived1
TYPE_PARAMETER name:Y index:0 variance: superTypes:[]
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
PROPERTY name:bar visibility:public modality:FINAL [var]
FIELD PROPERTY_BACKING_FIELD name:bar type:T of <root>.Derived1 visibility:public
EXPRESSION_BODY
CALL 'public final fun <get-x> (): T of <root>.Base declared in <root>.Base' type=T of <root>.Base origin=null
GET_VAR 'x: T of <uninitialized parent> declared in <root>.Derived1.<init>' type=T of <uninitialized parent> origin=null
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Derived1) returnType:T of <root>.Derived1
correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [var]
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1
@@ -40,7 +40,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-exn> (): T of <root>.Derived1 declared in <root>.Derived1'
CALL 'public final fun <get-x> (): T of <root>.Base declared in <root>.Base' type=T of <root>.Base origin=null
GET_VAR 'x: T of <uninitialized parent> declared in <root>.Derived1.<init>' type=T of <uninitialized parent> origin=null
FUN name:<set-exn> visibility:public modality:FINAL <> ($this:<root>.Derived1, value:T of <root>.Derived1) returnType:kotlin.Unit
correspondingProperty: PROPERTY name:exn visibility:public modality:FINAL [var]
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1
@@ -59,3 +59,4 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
overridden:
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.txt
Vendored
+7 -6
View File
@@ -1,12 +1,12 @@
FILE fqName:<root> fileName:/javaConstructorWithTypeParameters.kt
FUN name:test1 visibility:public modality:FINAL <> () returnType:<root>.J1
FUN name:test1 visibility:public modality:FINAL <> () returnType:<root>.J1<kotlin.Int>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.J1 declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1' type=<root>.J1 origin=null
FUN name:test2 visibility:public modality:FINAL <> () returnType:<root>.J1
RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.J1<kotlin.Int> declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
FUN name:test2 visibility:public modality:FINAL <> () returnType:<root>.J1<kotlin.Int>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.J1 declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> (x1: X1 of <uninitialized parent>?) declared in <root>.J1' type=<root>.J1 origin=null
RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.J1<kotlin.Int> declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> (x1: X1 of <uninitialized parent>?) declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
FUN name:test3 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:IrErrorType
VALUE_PARAMETER name:j1 index:0 type:<root>.J1<kotlin.Any>
BLOCK_BODY
@@ -18,3 +18,4 @@ FILE fqName:<root> fileName:/javaConstructorWithTypeParameters.kt
RETURN type=kotlin.Nothing from='public final fun test4 (j1: <root>.J1<kotlin.Any>): IrErrorType declared in <root>'
ERROR_CALL 'Unresolved reference: <Unresolved name: J2>#' type=IrErrorType
CONST Int type=kotlin.Int value=1
compiler/testData/ir/irText/stubs/javaEnum.fir.txt
Vendored
+6 -5
View File
@@ -1,10 +1,11 @@
FILE fqName:<root> fileName:/javaEnum.kt
PROPERTY name:test visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static]
FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum? visibility:public [final,static]
EXPRESSION_BODY
ERROR_CALL 'Unresolved reference: <Unresolved name: ONE>#' type=IrErrorType
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:IrErrorType
ERROR_CALL 'No getter found for R|/JEnum.ONE|' type=<root>.JEnum?
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:<root>.JEnum?
correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
RETURN type=kotlin.Nothing from='public final fun <get-test> (): <root>.JEnum? declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum? visibility:public [final,static] ' type=<root>.JEnum? origin=null
compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt
Vendored
+11 -39
View File
@@ -20,45 +20,17 @@ FILE fqName:<root> fileName:/javaInnerClass.kt
overridden:
public open fun bar (): kotlin.Unit declared in <root>.J
$this: VALUE_PARAMETER name:<this> type:<root>.J
FUN FAKE_OVERRIDE name:registerNatives visibility:private modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
overridden:
private open fun registerNatives (): kotlin.Unit declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:getClass visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:java.lang.Class<*>?
public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
overridden:
public final fun getClass (): java.lang.Class<*>? declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Int
public open fun hashCode (): kotlin.Int declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
overridden:
public open fun hashCode (): kotlin.Int declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object, obj:kotlin.Any?) returnType:kotlin.Boolean
overridden:
public open fun equals (obj: kotlin.Any?): kotlin.Boolean declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
VALUE_PARAMETER name:obj index:0 type:kotlin.Any?
FUN FAKE_OVERRIDE name:clone visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Any?
overridden:
protected/*protected and package*/ open fun clone (): kotlin.Any? declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.String?
overridden:
public open fun toString (): kotlin.String? declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:notify visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit
overridden:
public final fun notify (): kotlin.Unit declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:notifyAll visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit
overridden:
public final fun notifyAll (): kotlin.Unit declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
FUN FAKE_OVERRIDE name:wait visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object, <anonymous Java parameter>:kotlin.Long) returnType:kotlin.Unit
overridden:
public final fun wait (<anonymous Java parameter>: kotlin.Long): kotlin.Unit declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
VALUE_PARAMETER name:<anonymous Java parameter> index:0 type:kotlin.Long
FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit
overridden:
protected/*protected and package*/ open fun finalize (): kotlin.Unit declared in <no parent>.Object
$this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object
public open fun toString (): kotlin.String declared in kotlin.Any
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
compiler/testData/ir/irText/stubs/javaMethod.fir.txt
Vendored
+1
View File
@@ -4,3 +4,4 @@ FILE fqName:<root> fileName:/javaMethod.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test (j: <root>.J): kotlin.Unit declared in <root>'
CALL 'public open fun bar (): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt
Vendored
+1
View File
@@ -4,3 +4,4 @@ FILE fqName:<root> fileName:/javaNestedClass.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test (jj: <root>.J.JJ): kotlin.Unit declared in <root>'
CALL 'public open fun foo (): kotlin.Unit declared in <root>.J.JJ' type=kotlin.Unit origin=null
compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt
Vendored
+1
View File
@@ -8,3 +8,4 @@ FILE fqName:<root> fileName:/javaSyntheticProperty.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt
Vendored
+1
View File
@@ -5,3 +5,4 @@ FILE fqName:<root> fileName:/jdkClassSyntheticProperty.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
ERROR_CALL 'Unresolved reference: <Unresolved name: declaredFields>#' type=IrErrorType
compiler/testData/ir/irText/stubs/kotlinInnerClass.fir.txt
Vendored
+1
View File
@@ -4,3 +4,4 @@ FILE fqName:<root> fileName:/kotlinInnerClass.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test (inner: <root>.Outer.Inner): kotlin.Unit declared in <root>'
CALL 'public final fun foo (): kotlin.Unit declared in <root>.Outer.Inner' type=kotlin.Unit origin=null
compiler/testData/ir/irText/stubs/simple.fir.txt
Vendored
+7 -6
View File
@@ -1,11 +1,12 @@
FILE fqName:<root> fileName:/simple.kt
PROPERTY name:test visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static]
FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static]
EXPRESSION_BODY
ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
CONST Int type=kotlin.Int value=2
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:IrErrorType
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
other: CONST Int type=kotlin.Int value=2
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
RETURN type=kotlin.Nothing from='public final fun <get-test> (): kotlin.Int declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null