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

[IR] Properly resolve type parameters in case of property accessor

Browse Source 
- fix KT-41006
This commit is contained in:
Roman Artemev
2020-08-18 11:47:47 +03:00
parent a810dbb41b
commit 716c3668d6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt
+2 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.psi2ir.endOffsetOrUndefined
import org.jetbrains.kotlin.psi2ir.startOffsetOrUndefined import org.jetbrains.kotlin.psi2ir.startOffsetOrUndefined
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
import org.jetbrains.kotlin.resolve.descriptorUtil.propertyIfAccessor
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
class StandaloneDeclarationGenerator(private val context: GeneratorContext) { class StandaloneDeclarationGenerator(private val context: GeneratorContext) {
@@ -195,7 +196,7 @@ class StandaloneDeclarationGenerator(private val context: GeneratorContext) {
symbolTable.withScope(descriptor) { symbolTable.withScope(descriptor) {
generateOverridenSymbols(irFunction, descriptor.overriddenDescriptors) generateOverridenSymbols(irFunction, descriptor.overriddenDescriptors)
generateScopedTypeParameterDeclarations(irFunction, descriptor.typeParameters) generateScopedTypeParameterDeclarations(irFunction, descriptor.propertyIfAccessor.typeParameters)
generateValueParameterDeclarations(irFunction, descriptor, defaultArgumentFactory) generateValueParameterDeclarations(irFunction, descriptor, defaultArgumentFactory)
irFunction.returnType = descriptor.returnType?.toIrType() ?: error("Expected return type $descriptor") irFunction.returnType = descriptor.returnType?.toIrType() ?: error("Expected return type $descriptor")
} }