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

[FIR2IR] Use wrapped property accessor descriptors for accessors

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-03-20 13:27:22 +03:00
parent 92ac1d3f3d
commit 2e8b22e4be
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+9 -3
View File
@@ -8,7 +8,9 @@ package org.jetbrains.kotlin.fir.backend
import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter
import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter
@@ -431,10 +433,14 @@ class Fir2IrDeclarationStorage(
endOffset: Int endOffset: Int
): IrSimpleFunction { ): IrSimpleFunction {
val propertyDescriptor = correspondingProperty.descriptor val propertyDescriptor = correspondingProperty.descriptor
val descriptor = val descriptor = when {
if (propertyDescriptor is WrappedPropertyDescriptorWithContainerSource) propertyDescriptor is WrappedPropertyDescriptorWithContainerSource ->
WrappedFunctionDescriptorWithContainerSource(propertyDescriptor.containerSource) WrappedFunctionDescriptorWithContainerSource(propertyDescriptor.containerSource)
else WrappedSimpleFunctionDescriptor() isSetter ->
WrappedPropertySetterDescriptor(Annotations.EMPTY, SourceElement.NO_SOURCE)
else ->
WrappedPropertyGetterDescriptor(Annotations.EMPTY, SourceElement.NO_SOURCE)
}
val prefix = if (isSetter) "set" else "get" val prefix = if (isSetter) "set" else "get"
return symbolTable.declareSimpleFunction( return symbolTable.declareSimpleFunction(
propertyAccessor?.psi?.startOffsetSkippingComments ?: startOffset, propertyAccessor?.psi?.startOffsetSkippingComments ?: startOffset,