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

JVM IR: generate facade class for property accessors from dependencies

Browse Source
This commit is contained in:
Alexander Udalov
2019-07-24 17:32:01 +02:00
parent 28e2fd63ca
commit babbbd0ff6
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
+1 -2
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrFunction
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.declarations.IrPackageFragment
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
@@ -240,7 +239,7 @@ abstract class Symbols<out T : CommonBackendContext>(val context: T, private val
fun isLateinitIsInitializedPropertyGetter(symbol: IrFunctionSymbol): Boolean = fun isLateinitIsInitializedPropertyGetter(symbol: IrFunctionSymbol): Boolean =
symbol is IrSimpleFunctionSymbol && symbol.owner.let { function -> symbol is IrSimpleFunctionSymbol && symbol.owner.let { function ->
function.name.asString() == "<get-isInitialized>" && function.name.asString() == "<get-isInitialized>" &&
function.parent is IrPackageFragment && function.isTopLevel &&
function.getPackageFragment()!!.fqName.asString() == "kotlin" && function.getPackageFragment()!!.fqName.asString() == "kotlin" &&
function.valueParameters.isEmpty() && function.valueParameters.isEmpty() &&
symbol.owner.extensionReceiverParameter?.type?.classOrNull?.owner.let { receiverClass -> symbol.owner.extensionReceiverParameter?.type?.classOrNull?.owner.let { receiverClass ->
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
+5 -2
View File
@@ -350,8 +350,11 @@ val IrFunction.isStatic: Boolean
get() = parent is IrClass && dispatchReceiverParameter == null get() = parent is IrClass && dispatchReceiverParameter == null
val IrDeclaration.isTopLevel: Boolean val IrDeclaration.isTopLevel: Boolean
get() = parent is IrPackageFragment get() {
if (parent is IrPackageFragment) return true
val parentClass = parent as? IrClass
return parentClass?.origin == IrDeclarationOrigin.FILE_CLASS && parentClass.parent is IrPackageFragment
}
fun Scope.createTemporaryVariableWithWrappedDescriptor( fun Scope.createTemporaryVariableWithWrappedDescriptor(
irExpression: IrExpression, irExpression: IrExpression,
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
+3 -2
View File
@@ -67,8 +67,9 @@ class DeclarationStubGenerator(
} }
fun generateOrGetFacadeClass(descriptor: DeclarationDescriptor): IrClass? { fun generateOrGetFacadeClass(descriptor: DeclarationDescriptor): IrClass? {
val packageFragment = descriptor.containingDeclaration as? PackageFragmentDescriptor ?: return null val directMember = descriptor.safeAs<PropertyAccessorDescriptor>()?.correspondingProperty ?: descriptor
val containerSource = descriptor.safeAs<DescriptorWithContainerSource>()?.containerSource ?: return null val packageFragment = directMember.containingDeclaration as? PackageFragmentDescriptor ?: return null
val containerSource = directMember.safeAs<DescriptorWithContainerSource>()?.containerSource ?: return null
return facadeClassMap.getOrPut(containerSource) { return facadeClassMap.getOrPut(containerSource) {
facadeClassGenerator(containerSource)?.also { facade -> facadeClassGenerator(containerSource)?.also { facade ->
val packageStub = generateOrGetEmptyExternalPackageFragmentStub(packageFragment) val packageStub = generateOrGetEmptyExternalPackageFragmentStub(packageFragment)