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

IR: relax type cast for WrappedVariableDescriptor.containingDeclaration

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-10-18 14:15:35 +03:00
parent b588839752
commit 8e331c8afe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
+1 -1
View File
@@ -308,7 +308,7 @@ fun IrTypeParameter.toIrBasedDescriptor() = IrBasedTypeParameterDescriptor(this)
open class IrBasedVariableDescriptor(owner: IrVariable) : VariableDescriptor, IrBasedCallableDescriptor<IrVariable>(owner) { open class IrBasedVariableDescriptor(owner: IrVariable) : VariableDescriptor, IrBasedCallableDescriptor<IrVariable>(owner) {
override fun getContainingDeclaration() = (owner.parent as IrFunction).toIrBasedDescriptor() override fun getContainingDeclaration() = (owner.parent as IrDeclaration).toIrBasedDescriptor()
override fun getType() = owner.type.toIrBasedKotlinType() override fun getType() = owner.type.toIrBasedKotlinType()
override fun getReturnType() = getType() override fun getReturnType() = getType()
override fun getName() = owner.name override fun getName() = owner.name
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt
+1 -1
View File
@@ -303,7 +303,7 @@ open class WrappedTypeParameterDescriptor : TypeParameterDescriptor, WrappedDecl
@OptIn(ObsoleteDescriptorBasedAPI::class) @OptIn(ObsoleteDescriptorBasedAPI::class)
open class WrappedVariableDescriptor : VariableDescriptor, WrappedCallableDescriptor<IrVariable>() { open class WrappedVariableDescriptor : VariableDescriptor, WrappedCallableDescriptor<IrVariable>() {
override fun getContainingDeclaration() = (owner.parent as IrFunction).descriptor override fun getContainingDeclaration() = (owner.parent as IrDeclaration).descriptor
override fun getType() = owner.type.toKotlinType() override fun getType() = owner.type.toKotlinType()
override fun getReturnType() = getType() override fun getReturnType() = getType()
override fun getName() = owner.name override fun getName() = owner.name