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

Fix delegated function body generation

Browse Source
This commit is contained in:
Dmitry Petrov
2018-06-27 16:49:24 +03:00
parent 71c5bf0b97
commit b1d0a5e807
2 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+1 -1
View File
@@ -279,7 +279,7 @@ class ClassGenerator(
else { else {
val substitutor = val substitutor =
TypeSubstitutor.create( TypeSubstitutor.create(
overridden.original.typeParameters.associate { overridden.typeParameters.associate {
val delegatedDefaultType = delegated.typeParameters[it.index].defaultType val delegatedDefaultType = delegated.typeParameters[it.index].defaultType
it.typeConstructor to TypeProjectionImpl(delegatedDefaultType) it.typeConstructor to TypeProjectionImpl(delegatedDefaultType)
} }
compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
Vendored
+31 -44
View File
@@ -1,45 +1,35 @@
FILE fqName:<root> fileName:/delegatedMembers.kt FILE fqName:<root> fileName:/delegatedMembers.kt
CLASS INTERFACE name:IBase modality:ABSTRACT visibility:public flags: CLASS INTERFACE name:IBase modality:ABSTRACT visibility:public flags: superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:IBase<T> flags: $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:IBase<T> flags:
superClasses: TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags: FUN name:foo visibility:public modality:ABSTRACT <> ($this:IBase<T>, x:kotlin.Int) returnType:kotlin.Unit flags:
TYPE_PARAMETER name:T index:0 variance: upperBounds:[kotlin.Any?]
superClassifiers:
CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
FUN name:foo visibility:public modality:ABSTRACT <> ($this:IBase<T>, x:kotlin.Int) returnType:Unit flags:
$this: VALUE_PARAMETER name:<this> type:IBase<T> flags: $this: VALUE_PARAMETER name:<this> type:IBase<T> flags:
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags: VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
PROPERTY name:bar type:kotlin.Int visibility:public modality:ABSTRACT flags:val PROPERTY name:bar visibility:public modality:ABSTRACT flags:val
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBase<T>) returnType:Int flags: FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBase<T>) returnType:kotlin.Int flags:
correspondingProperty: PROPERTY name:bar type:kotlin.Int visibility:public modality:ABSTRACT flags:val correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT flags:val
$this: VALUE_PARAMETER name:<this> type:IBase<T> flags: $this: VALUE_PARAMETER name:<this> type:IBase<T> flags:
FUN name:qux visibility:public modality:ABSTRACT <X> ($this:IBase<T>, t:T, x:X) returnType:Unit flags: FUN name:qux visibility:public modality:ABSTRACT <X> ($this:IBase<T>, t:T, x:X) returnType:kotlin.Unit flags:
TYPE_PARAMETER name:X index:0 variance: upperBounds:[kotlin.Any?] TYPE_PARAMETER name:X index:0 variance: superTypes:[kotlin.Any?]
superClassifiers:
CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
$this: VALUE_PARAMETER name:<this> type:IBase<T> flags: $this: VALUE_PARAMETER name:<this> type:IBase<T> flags:
VALUE_PARAMETER name:t index:0 type:T flags: VALUE_PARAMETER name:t index:0 type:T flags:
VALUE_PARAMETER name:x index:1 type:X flags: VALUE_PARAMETER name:x index:1 type:X flags:
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
overridden: overridden:
FUN IR_EXTERNAL_DECLARATION_STUB name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: FUN IR_EXTERNAL_DECLARATION_STUB name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
$this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags: VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:Int flags: FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
overridden: overridden:
FUN IR_EXTERNAL_DECLARATION_STUB name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:Int flags: FUN IR_EXTERNAL_DECLARATION_STUB name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
$this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
overridden: overridden:
FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
$this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
CLASS CLASS name:Test modality:FINAL visibility:public flags: CLASS CLASS name:Test modality:FINAL visibility:public flags: superTypes:[IBase<TT>]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test<TT> flags: $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Test<TT> flags:
superClasses: TYPE_PARAMETER name:TT index:0 variance: superTypes:[kotlin.Any?]
CLASS INTERFACE name:IBase modality:ABSTRACT visibility:public flags:
TYPE_PARAMETER name:TT index:0 variance: upperBounds:[kotlin.Any?]
superClassifiers:
CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
CONSTRUCTOR visibility:public <> (impl:IBase<TT>) returnType:Test<TT> flags:primary CONSTRUCTOR visibility:public <> (impl:IBase<TT>) returnType:Test<TT> flags:primary
VALUE_PARAMETER name:impl index:0 type:IBase<TT> flags: VALUE_PARAMETER name:impl index:0 type:IBase<TT> flags:
BLOCK_BODY BLOCK_BODY
@@ -48,12 +38,10 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
FIELD DELEGATE name:Test$IBase$delegate type:IBase<TT> visibility:private flags:final FIELD DELEGATE name:Test$IBase$delegate type:IBase<TT> visibility:private flags:final
EXPRESSION_BODY EXPRESSION_BODY
GET_VAR 'value-parameter impl: IBase<TT>' type=IBase<TT> origin=null GET_VAR 'value-parameter impl: IBase<TT>' type=IBase<TT> origin=null
FUN DELEGATED_MEMBER name:qux visibility:public modality:OPEN <X> ($this:Test<TT>, t:TT, x:X) returnType:Unit flags: FUN DELEGATED_MEMBER name:qux visibility:public modality:OPEN <X> ($this:Test<TT>, t:TT, x:X) returnType:kotlin.Unit flags:
overridden: overridden:
FUN name:qux visibility:public modality:ABSTRACT <X> ($this:IBase<T>, t:T, x:X) returnType:Unit flags: FUN name:qux visibility:public modality:ABSTRACT <X> ($this:IBase<T>, t:T, x:X) returnType:kotlin.Unit flags:
TYPE_PARAMETER name:X index:0 variance: upperBounds:[kotlin.Any?] TYPE_PARAMETER name:X index:0 variance: superTypes:[kotlin.Any?]
superClassifiers:
CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags:
$this: VALUE_PARAMETER name:<this> type:Test<TT> flags: $this: VALUE_PARAMETER name:<this> type:Test<TT> flags:
VALUE_PARAMETER name:t index:0 type:TT flags: VALUE_PARAMETER name:t index:0 type:TT flags:
VALUE_PARAMETER name:x index:1 type:X flags: VALUE_PARAMETER name:x index:1 type:X flags:
@@ -64,9 +52,9 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
t: GET_VAR 'value-parameter t: TT' type=TT origin=null t: GET_VAR 'value-parameter t: TT' type=TT origin=null
x: GET_VAR 'value-parameter x: X' type=X origin=null x: GET_VAR 'value-parameter x: X' type=X origin=null
FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:Test<TT>, x:kotlin.Int) returnType:Unit flags: FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:Test<TT>, x:kotlin.Int) returnType:kotlin.Unit flags:
overridden: overridden:
FUN name:foo visibility:public modality:ABSTRACT <> ($this:IBase<T>, x:kotlin.Int) returnType:Unit flags: FUN name:foo visibility:public modality:ABSTRACT <> ($this:IBase<T>, x:kotlin.Int) returnType:kotlin.Unit flags:
$this: VALUE_PARAMETER name:<this> type:Test<TT> flags: $this: VALUE_PARAMETER name:<this> type:Test<TT> flags:
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags: VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
BLOCK_BODY BLOCK_BODY
@@ -74,28 +62,27 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
$this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
PROPERTY DELEGATED_MEMBER name:bar type:kotlin.Int visibility:public modality:OPEN flags:val PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN flags:val
FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:Test<TT>) returnType:Int flags: FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:Test<TT>) returnType:kotlin.Int flags:
correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar type:kotlin.Int visibility:public modality:OPEN flags:val correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN flags:val
overridden: overridden:
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBase<T>) returnType:Int flags: FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:IBase<T>) returnType:kotlin.Int flags:
$this: VALUE_PARAMETER name:<this> type:Test<TT> flags: $this: VALUE_PARAMETER name:<this> type:Test<TT> flags:
BLOCK_BODY BLOCK_BODY
RETURN type=kotlin.Nothing from='<get-bar>(): Int' RETURN type=kotlin.Nothing from='<get-bar>(): Int'
CALL '<get-bar>(): Int' type=kotlin.Int origin=null CALL '<get-bar>(): Int' type=kotlin.Int origin=null
$this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
overridden: overridden:
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
$this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags: VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:Int flags: FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
overridden: overridden:
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:Int flags: FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
$this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags:
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
overridden: overridden:
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
$this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: $this: VALUE_PARAMETER name:<this> type:kotlin.Any flags: