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

JVM_IR: specify facadeClassGenerator properly in Psi2IrTranslator

Browse Source
This commit is contained in:
Georgy Bronnikov
2019-07-05 14:59:01 +03:00
committed by Alexander Udalov
parent 1d3b1ed0cb
commit 0423d0f41e
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt
+17 -2
View File
@@ -382,7 +382,15 @@ open class WrappedSimpleFunctionDescriptor(
var originalDescriptor: FunctionDescriptor? = null
override fun getOverriddenDescriptors() = owner.overriddenSymbols.map { it.descriptor }
override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
override fun getContainingDeclaration(): DeclarationDescriptor {
val parent = owner.parent
return if (parent is IrClass && parent.origin == IrDeclarationOrigin.FILE_CLASS && parent.parent is IrExternalPackageFragment) {
return (parent.parent as IrExternalPackageFragment).packageFragmentDescriptor
} else {
(parent as IrSymbolOwner).symbol.descriptor
}
}
override fun getModality() = owner.modality
override fun getName() = owner.name
override fun getVisibility() = owner.visibility
@@ -833,7 +841,14 @@ open class WrappedPropertyDescriptor(
override fun isConst() = owner.isConst
override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
override fun getContainingDeclaration(): DeclarationDescriptor {
val parent = owner.parent
return if (parent is IrClass && parent.origin == IrDeclarationOrigin.FILE_CLASS && parent.parent is IrExternalPackageFragment) {
return (parent.parent as IrExternalPackageFragment).packageFragmentDescriptor
} else {
(parent as IrSymbolOwner).symbol.descriptor
}
}
override fun isLateInit() = owner.isLateinit