IR: don't use descriptors in rendering (work in progress)

There's some descriptor-based code remaining. Need some more work on IR.
This commit is contained in:
Dmitry Petrov
2019-03-14 14:17:26 +03:00
parent bd3d5a9dbb
commit e49eae528c
319 changed files with 18613 additions and 18703 deletions
+64 -64
View File
@@ -1,74 +1,74 @@
@0:0..15:0 FILE fqName:<root> fileName:/kt29862.kt
@0:0..3:1 CLASS CLASS name:Test1 modality:ABSTRACT visibility:public flags: superTypes:[kotlin.Any]
@0:0..3:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test1 flags:
@0:9..3:1 CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:Test1 flags:primary
@1:4..14 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
@0:0..3:1 CLASS CLASS name:Test1 modality:ABSTRACT visibility:public flags:[] superTypes:[kotlin.Any]
@0:0..3:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1 flags:[]
@0:9..3:1 CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test1 flags:[primary]
@1:4..14 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:[]
@0:0..3:1 BLOCK_BODY
@0:0..3:1 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@0:0..3:1 INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
@1:4..14 PROPERTY name:x visibility:public modality:FINAL flags:val
@1:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
@0:0..3:1 DELEGATING_CONSTRUCTOR_CALL 'CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:kotlin.Any flags:[primary]'
@0:0..3:1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:ABSTRACT visibility:public flags:[] superTypes:[kotlin.Any]'
@1:4..14 PROPERTY name:x visibility:public modality:FINAL flags:[val]
@1:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:[final]
@1:4..14 EXPRESSION_BODY
@1:4..14 GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@1:4..14 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test1) returnType:kotlin.Int flags:
@1:4..14 VALUE_PARAMETER name:<this> type:Test1 flags:
@1:4..14 GET_VAR 'VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:[]' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@1:4..14 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Int flags:[]
@1:4..14 VALUE_PARAMETER name:<this> type:<root>.Test1 flags:[]
@1:4..14 BLOCK_BODY
@1:4..14 RETURN type=kotlin.Nothing from='<get-x>(): Int'
@1:4..14 GET_FIELD 'x: Int' type=kotlin.Int origin=null
@1:4..14 GET_VAR 'this@Test1: Test1' type=Test1 origin=null
@0:9..3:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
@0:0..3:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@0:9..3:1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
@0:9..3:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
@0:0..3:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@0:9..3:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
@0:0..3:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@5:0..14:1 CLASS CLASS name:Test2 modality:ABSTRACT visibility:public flags: superTypes:[kotlin.Any]
@5:0..14:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test2 flags:
@7:0..14:1 CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:Test2 flags:primary
@8:4..14 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
@1:4..14 RETURN type=kotlin.Nothing from='FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Int flags:[]'
@1:4..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:[final]' type=kotlin.Int origin=null
@1:4..14 GET_VAR 'VALUE_PARAMETER name:<this> type:<root>.Test1 flags:[]' type=<root>.Test1 origin=null
@0:9..3:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:[]
@0:0..3:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@0:9..3:1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:[]
@0:9..3:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:[]
@0:0..3:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@0:9..3:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:[]
@0:0..3:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@5:0..14:1 CLASS CLASS name:Test2 modality:ABSTRACT visibility:public flags:[] superTypes:[kotlin.Any]
@5:0..14:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2 flags:[]
@7:0..14:1 CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test2 flags:[primary]
@8:4..14 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:[]
@5:0..14:1 BLOCK_BODY
@5:0..14:1 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@5:0..14:1 INSTANCE_INITIALIZER_CALL classDescriptor='Test2'
@8:4..14 PROPERTY name:x visibility:public modality:FINAL flags:val
@8:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
@5:0..14:1 DELEGATING_CONSTRUCTOR_CALL 'CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:kotlin.Any flags:[primary]'
@5:0..14:1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:ABSTRACT visibility:public flags:[] superTypes:[kotlin.Any]'
@8:4..14 PROPERTY name:x visibility:public modality:FINAL flags:[val]
@8:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:[final]
@8:4..14 EXPRESSION_BODY
@8:4..14 GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@8:4..14 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2) returnType:kotlin.Int flags:
@8:4..14 VALUE_PARAMETER name:<this> type:Test2 flags:
@8:4..14 GET_VAR 'VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:[]' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@8:4..14 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Int flags:[]
@8:4..14 VALUE_PARAMETER name:<this> type:<root>.Test2 flags:[]
@8:4..14 BLOCK_BODY
@8:4..14 RETURN type=kotlin.Nothing from='<get-x>(): Int'
@8:4..14 GET_FIELD 'x: Int' type=kotlin.Int origin=null
@8:4..14 GET_VAR 'this@Test2: Test2' type=Test2 origin=null
@10:4..13:5 CLASS CLASS name:TestInner modality:FINAL visibility:public flags:inner superTypes:[kotlin.Any]
@10:4..13:5 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test2.TestInner flags:
@11:4..13:5 CONSTRUCTOR visibility:public <> ($this:Test2, x:kotlin.Int) returnType:Test2.TestInner flags:primary
@11:19..13:5 VALUE_PARAMETER name:<this> type:Test2 flags:
@12:8..18 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
@8:4..14 RETURN type=kotlin.Nothing from='FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Int flags:[]'
@8:4..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:[final]' type=kotlin.Int origin=null
@8:4..14 GET_VAR 'VALUE_PARAMETER name:<this> type:<root>.Test2 flags:[]' type=<root>.Test2 origin=null
@10:4..13:5 CLASS CLASS name:TestInner modality:FINAL visibility:public flags:[inner] superTypes:[kotlin.Any]
@10:4..13:5 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2.TestInner flags:[]
@11:4..13:5 CONSTRUCTOR visibility:public <> ($this:<root>.Test2, x:kotlin.Int) returnType:<root>.Test2.TestInner flags:[primary]
@11:19..13:5 VALUE_PARAMETER name:<this> type:<root>.Test2 flags:[]
@12:8..18 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:[]
@10:4..13:5 BLOCK_BODY
@10:4..13:5 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@10:4..13:5 INSTANCE_INITIALIZER_CALL classDescriptor='TestInner'
@12:8..18 PROPERTY name:x visibility:public modality:FINAL flags:val
@12:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
@10:4..13:5 DELEGATING_CONSTRUCTOR_CALL 'CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:kotlin.Any flags:[primary]'
@10:4..13:5 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public flags:[inner] superTypes:[kotlin.Any]'
@12:8..18 PROPERTY name:x visibility:public modality:FINAL flags:[val]
@12:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:[final]
@12:8..18 EXPRESSION_BODY
@12:8..18 GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@12:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:Test2.TestInner) returnType:kotlin.Int flags:
@12:8..18 VALUE_PARAMETER name:<this> type:Test2.TestInner flags:
@12:8..18 GET_VAR 'VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:[]' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
@12:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2.TestInner) returnType:kotlin.Int flags:[]
@12:8..18 VALUE_PARAMETER name:<this> type:<root>.Test2.TestInner flags:[]
@12:8..18 BLOCK_BODY
@12:8..18 RETURN type=kotlin.Nothing from='<get-x>(): Int'
@12:8..18 GET_FIELD 'x: Int' type=kotlin.Int origin=null
@12:8..18 GET_VAR 'this@TestInner: TestInner' type=Test2.TestInner origin=null
@11:4..13:5 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
@10:4..13:5 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@11:4..13:5 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
@11:4..13:5 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
@10:4..13:5 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@11:4..13:5 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
@10:4..13:5 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@7:0..14:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
@5:0..14:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@7:0..14:1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
@7:0..14:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
@5:0..14:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@7:0..14:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
@5:0..14:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
@12:8..18 RETURN type=kotlin.Nothing from='FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2.TestInner) returnType:kotlin.Int flags:[]'
@12:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:[final]' type=kotlin.Int origin=null
@12:8..18 GET_VAR 'VALUE_PARAMETER name:<this> type:<root>.Test2.TestInner flags:[]' type=<root>.Test2.TestInner origin=null
@11:4..13:5 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:[]
@10:4..13:5 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@11:4..13:5 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:[]
@11:4..13:5 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:[]
@10:4..13:5 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@11:4..13:5 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:[]
@10:4..13:5 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@7:0..14:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:[]
@5:0..14:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@7:0..14:1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:[]
@7:0..14:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:[]
@5:0..14:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]
@7:0..14:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:[]
@5:0..14:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:[]