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

FIR2IR: use DescriptorWithContainerSource if container source is available

Browse Source 
The use of DescriptorWithContainerSource is the key to trigger the
proper generation of stub facade class as parent.
This commit is contained in:
Jinseong Jeon
2020-07-21 10:46:30 -07:00
committed by Mikhail Glukhikh
parent c076d81f0c
commit 85f692ab40
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+6 -2
View File
@@ -355,7 +355,9 @@ class Fir2IrDeclarationStorage(
factory: (IrSimpleFunctionSymbol) -> IrSimpleFunction factory: (IrSimpleFunctionSymbol) -> IrSimpleFunction
): IrSimpleFunction { ): IrSimpleFunction {
if (signature == null) { if (signature == null) {
val descriptor = WrappedSimpleFunctionDescriptor() val descriptor =
if (containerSource != null) WrappedFunctionDescriptorWithContainerSource(containerSource)
else WrappedSimpleFunctionDescriptor()
return symbolTable.declareSimpleFunction(descriptor, factory).apply { descriptor.bind(this) } return symbolTable.declareSimpleFunction(descriptor, factory).apply { descriptor.bind(this) }
} }
return symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory) return symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory)
@@ -601,7 +603,9 @@ class Fir2IrDeclarationStorage(
factory: (IrPropertySymbol) -> IrProperty factory: (IrPropertySymbol) -> IrProperty
): IrProperty { ): IrProperty {
if (signature == null) { if (signature == null) {
val descriptor = WrappedPropertyDescriptor() val descriptor =
if (containerSource != null) WrappedPropertyDescriptorWithContainerSource(containerSource)
else WrappedPropertyDescriptor()
return symbolTable.declareProperty(0, 0, IrDeclarationOrigin.DEFINED, descriptor, isDelegated = false, factory).apply { return symbolTable.declareProperty(0, 0, IrDeclarationOrigin.DEFINED, descriptor, isDelegated = false, factory).apply {
descriptor.bind(this) descriptor.bind(this)
} }