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

[FIR2IR] Enter scope a bit earlier in createIrPropertyAccessor

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-11-12 16:56:00 +03:00
committed by teamcityserver
parent 59c86bcdc4
commit 8ecf056927
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+3 -1
View File
@@ -613,12 +613,14 @@ class Fir2IrDeclarationStorage(
) )
) )
} }
// NB: we should enter accessor' scope before declaring its parameters
// (both setter default and receiver ones, if any)
enterScope(this)
if (propertyAccessor == null && isSetter) { if (propertyAccessor == null && isSetter) {
declareDefaultSetterParameter( declareDefaultSetterParameter(
property.returnTypeRef.toIrType(ConversionTypeContext.DEFAULT.inSetter()) property.returnTypeRef.toIrType(ConversionTypeContext.DEFAULT.inSetter())
) )
} }
enterScope(this)
bindAndDeclareParameters( bindAndDeclareParameters(
propertyAccessor, irParent, propertyAccessor, irParent,
thisReceiverOwner, isStatic = irParent !is IrClass, parentPropertyReceiverType = property.receiverTypeRef thisReceiverOwner, isStatic = irParent !is IrClass, parentPropertyReceiverType = property.receiverTypeRef