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

[FIR2IR] Extract logic of IR declarations generation into separate component. Part 2

Browse Source 
This commit fixes access of enter/leaveScope in Fir2IrCallableDeclarationsGenerator
This commit is contained in:
Dmitriy Novozhilov
2023-08-28 11:21:32 +03:00
committed by Space Team
parent 08ebe04485
commit 12c02897e1
2 changed files with 129 additions and 125 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
@@ -40,7 +40,6 @@ import org.jetbrains.kotlin.ir.expressions.IrSyntheticBodyKind
import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.symbols.*
import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl
import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.IrSimpleType
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.load.kotlin.FacadeClassSource import org.jetbrains.kotlin.load.kotlin.FacadeClassSource
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -49,7 +48,6 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
import org.jetbrains.kotlin.types.AbstractTypeChecker
import org.jetbrains.kotlin.utils.threadLocal import org.jetbrains.kotlin.utils.threadLocal
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
@@ -254,6 +252,12 @@ class Fir2IrDeclarationStorage(
symbolTable.leaveScope(symbol) symbolTable.leaveScope(symbol)
} }
inline fun withScope(symbol: IrSymbol, crossinline block: () -> Unit) {
enterScope(symbol)
block()
leaveScope(symbol)
}
private fun getIrExternalOrBuiltInsPackageFragment(fqName: FqName, firOrigin: FirDeclarationOrigin): IrExternalPackageFragment { private fun getIrExternalOrBuiltInsPackageFragment(fqName: FqName, firOrigin: FirDeclarationOrigin): IrExternalPackageFragment {
val isBuiltIn = fqName in BUILT_INS_PACKAGE_FQ_NAMES val isBuiltIn = fqName in BUILT_INS_PACKAGE_FQ_NAMES
return if (isBuiltIn) getIrBuiltInsPackageFragment(fqName) else getIrExternalPackageFragment(fqName, firOrigin) return if (isBuiltIn) getIrBuiltInsPackageFragment(fqName) else getIrExternalPackageFragment(fqName, firOrigin)
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/Fir2IrCallableDeclarationsGenerator.kt
+123 -123
View File
@@ -329,16 +329,16 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
containerSource = simpleFunction?.containerSource, containerSource = simpleFunction?.containerSource,
).apply { ).apply {
metadata = FirMetadataSource.Function(function) metadata = FirMetadataSource.Function(function)
enterScope(this.symbol) declarationStorage.withScope(symbol) {
setAndModifyParent(this, irParent) setAndModifyParent(this, irParent)
declareParameters( declareParameters(
function, irParent, function, irParent,
dispatchReceiverType = computeDispatchReceiverType(this, simpleFunction, irParent), dispatchReceiverType = computeDispatchReceiverType(this, simpleFunction, irParent),
isStatic = simpleFunction?.isStatic == true, isStatic = simpleFunction?.isStatic == true,
forSetter = false, forSetter = false,
) )
convertAnnotationsForNonDeclaredMembers(function, origin) convertAnnotationsForNonDeclaredMembers(function, origin)
leaveScope(this.symbol) }
} }
} }
result result
@@ -423,10 +423,10 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
// Add to cache before generating parameters to prevent an infinite loop when an annotation value parameter is annotated // Add to cache before generating parameters to prevent an infinite loop when an annotation value parameter is annotated
// with the annotation itself. // with the annotation itself.
constructorCache[constructor] = this constructorCache[constructor] = this
enterScope(this.symbol) declarationStorage.withScope(symbol) {
setAndModifyParent(this, irParent) setAndModifyParent(this, irParent)
declareParameters(constructor, irParent, dispatchReceiverType = null, isStatic = false, forSetter = false) declareParameters(constructor, irParent, dispatchReceiverType = null, isStatic = false, forSetter = false)
leaveScope(this.symbol) }
} }
} }
} }
@@ -501,23 +501,23 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
property, if (isSetter) ConversionTypeOrigin.SETTER else ConversionTypeOrigin.DEFAULT property, if (isSetter) ConversionTypeOrigin.SETTER else ConversionTypeOrigin.DEFAULT
) )
} }
val dispatchReceiverType = computeDispatchReceiverType(this, property, irParent)
// NB: we should enter accessor' scope before declaring its parameters // NB: we should enter accessor' scope before declaring its parameters
// (both setter default and receiver ones, if any) // (both setter default and receiver ones, if any)
enterScope(this.symbol) declarationStorage.withScope(symbol) {
if (propertyAccessor == null && isSetter) { if (propertyAccessor == null && isSetter) {
declareDefaultSetterParameter( declareDefaultSetterParameter(
property.returnTypeRef.toIrType(ConversionTypeOrigin.SETTER), property.returnTypeRef.toIrType(ConversionTypeOrigin.SETTER),
firValueParameter = null firValueParameter = null
)
}
setAndModifyParent(this, irParent)
declareParameters(
propertyAccessor, irParent, dispatchReceiverType,
isStatic = irParent !is IrClass || propertyAccessor?.isStatic == true, forSetter = isSetter,
parentPropertyReceiver = property.receiverParameter,
) )
} }
setAndModifyParent(this, irParent)
val dispatchReceiverType = computeDispatchReceiverType(this, property, irParent)
declareParameters(
propertyAccessor, irParent, dispatchReceiverType,
isStatic = irParent !is IrClass || propertyAccessor?.isStatic == true, forSetter = isSetter,
parentPropertyReceiver = property.receiverParameter,
)
leaveScope(this.symbol)
if (correspondingProperty is Fir2IrLazyProperty && correspondingProperty.containingClass != null && !isFakeOverride && dispatchReceiverType != null) { if (correspondingProperty is Fir2IrLazyProperty && correspondingProperty.containingClass != null && !isFakeOverride && dispatchReceiverType != null) {
this.overriddenSymbols = correspondingProperty.fir.generateOverriddenAccessorSymbols( this.overriddenSymbols = correspondingProperty.fir.generateOverriddenAccessorSymbols(
correspondingProperty.containingClass, !isSetter correspondingProperty.containingClass, !isSetter
@@ -626,96 +626,96 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
).apply { ).apply {
metadata = FirMetadataSource.Property(property) metadata = FirMetadataSource.Property(property)
convertAnnotationsForNonDeclaredMembers(property, origin) convertAnnotationsForNonDeclaredMembers(property, origin)
enterScope(this.symbol) declarationStorage.withScope(symbol) {
if (irParent != null) { if (irParent != null) {
parent = irParent parent = irParent
} }
val type = property.returnTypeRef.toIrType() val type = property.returnTypeRef.toIrType()
val delegate = property.delegate val delegate = property.delegate
val getter = property.getter val getter = property.getter
val setter = property.setter val setter = property.setter
if (delegate != null || property.hasBackingField) { if (delegate != null || property.hasBackingField) {
val backingField = if (delegate != null) { val backingField = if (delegate != null) {
((delegate as? FirQualifiedAccessExpression)?.calleeReference?.toResolvedBaseSymbol()?.fir as? FirTypeParameterRefsOwner)?.let { ((delegate as? FirQualifiedAccessExpression)?.calleeReference?.toResolvedBaseSymbol()?.fir as? FirTypeParameterRefsOwner)?.let {
classifierStorage.preCacheTypeParameters(it, symbol) classifierStorage.preCacheTypeParameters(it, symbol)
} }
createBackingField( createBackingField(
this, this,
property, property,
IrDeclarationOrigin.PROPERTY_DELEGATE, IrDeclarationOrigin.PROPERTY_DELEGATE,
components.visibilityConverter.convertToDescriptorVisibility(property.fieldVisibility), components.visibilityConverter.convertToDescriptorVisibility(property.fieldVisibility),
NameUtils.propertyDelegateName(property.name), NameUtils.propertyDelegateName(property.name),
true, true,
delegate delegate
) )
} else { } else {
val initializer = getEffectivePropertyInitializer(property, resolveIfNeeded = true) val initializer = getEffectivePropertyInitializer(property, resolveIfNeeded = true)
// There are cases when we get here for properties // There are cases when we get here for properties
// that have no backing field. For example, in the // that have no backing field. For example, in the
// funExpression.kt test there's an attempt // funExpression.kt test there's an attempt
// to access the `javaClass` property of the `foo0`'s // to access the `javaClass` property of the `foo0`'s
// `block` argument // `block` argument
val typeToUse = property.backingField?.returnTypeRef?.toIrType() ?: type val typeToUse = property.backingField?.returnTypeRef?.toIrType() ?: type
createBackingField( createBackingField(
this, this,
property, property,
IrDeclarationOrigin.PROPERTY_BACKING_FIELD, IrDeclarationOrigin.PROPERTY_BACKING_FIELD,
components.visibilityConverter.convertToDescriptorVisibility(property.fieldVisibility), components.visibilityConverter.convertToDescriptorVisibility(property.fieldVisibility),
property.name, property.name,
property.isVal, property.isVal,
initializer, initializer,
typeToUse typeToUse
).also { field -> ).also { field ->
if (initializer is FirConstExpression<*>) { if (initializer is FirConstExpression<*>) {
val constType = initializer.resolvedType.toIrType() val constType = initializer.resolvedType.toIrType()
field.initializer = factory.createExpressionBody(initializer.toIrConst(constType)) field.initializer = factory.createExpressionBody(initializer.toIrConst(constType))
}
} }
} }
backingField.symbol.let {
backingFieldForPropertyCache[symbol] = it
propertyForBackingFieldCache[it] = symbol
}
this.backingField = backingField
} }
backingField.symbol.let { if (irParent != null) {
backingFieldForPropertyCache[symbol] = it backingField?.parent = irParent
propertyForBackingFieldCache[it] = symbol
} }
this.backingField = backingField this.getter = createIrPropertyAccessor(
} getter, property, this, type, irParent, false,
if (irParent != null) {
backingField?.parent = irParent
}
this.getter = createIrPropertyAccessor(
getter, property, this, type, irParent, false,
when {
origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB -> origin
origin == IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER -> origin
delegate != null -> IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR
origin == IrDeclarationOrigin.FAKE_OVERRIDE -> origin
origin == IrDeclarationOrigin.DELEGATED_MEMBER -> origin
getter == null || getter is FirDefaultPropertyGetter -> IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR
else -> origin
},
startOffset, endOffset,
dontUseSignature = signature == null, fakeOverrideOwnerLookupTag,
property.unwrapFakeOverrides().getter,
).also {
getterForPropertyCache[symbol] = it.symbol
}
if (property.isVar) {
this.setter = createIrPropertyAccessor(
setter, property, this, type, irParent, true,
when { when {
origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB -> origin
origin == IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER -> origin
delegate != null -> IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR delegate != null -> IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR
origin == IrDeclarationOrigin.FAKE_OVERRIDE -> origin origin == IrDeclarationOrigin.FAKE_OVERRIDE -> origin
origin == IrDeclarationOrigin.DELEGATED_MEMBER -> origin origin == IrDeclarationOrigin.DELEGATED_MEMBER -> origin
setter is FirDefaultPropertySetter -> IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR getter == null || getter is FirDefaultPropertyGetter -> IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR
else -> origin else -> origin
}, },
startOffset, endOffset, startOffset, endOffset,
dontUseSignature = signature == null, fakeOverrideOwnerLookupTag, dontUseSignature = signature == null, fakeOverrideOwnerLookupTag,
property.unwrapFakeOverrides().setter, property.unwrapFakeOverrides().getter,
).also { ).also {
setterForPropertyCache[symbol] = it.symbol getterForPropertyCache[symbol] = it.symbol
}
if (property.isVar) {
this.setter = createIrPropertyAccessor(
setter, property, this, type, irParent, true,
when {
delegate != null -> IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR
origin == IrDeclarationOrigin.FAKE_OVERRIDE -> origin
origin == IrDeclarationOrigin.DELEGATED_MEMBER -> origin
setter is FirDefaultPropertySetter -> IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR
else -> origin
},
startOffset, endOffset,
dontUseSignature = signature == null, fakeOverrideOwnerLookupTag,
property.unwrapFakeOverrides().setter,
).also {
setterForPropertyCache[symbol] = it.symbol
}
} }
} }
leaveScope(this.symbol)
} }
} }
if (property.isFakeOverride(fakeOverrideOwnerLookupTag)) { if (property.isFakeOverride(fakeOverrideOwnerLookupTag)) {
@@ -956,31 +956,31 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
}.apply { }.apply {
parent = irParent parent = irParent
metadata = FirMetadataSource.Property(property) metadata = FirMetadataSource.Property(property)
enterScope(this.symbol) declarationStorage.withScope(symbol) {
delegate = declareIrVariable( delegate = declareIrVariable(
startOffset, endOffset, IrDeclarationOrigin.PROPERTY_DELEGATE, startOffset, endOffset, IrDeclarationOrigin.PROPERTY_DELEGATE,
NameUtils.propertyDelegateName(property.name), property.delegate!!.resolvedType.toIrType(), NameUtils.propertyDelegateName(property.name), property.delegate!!.resolvedType.toIrType(),
isVar = false, isConst = false, isLateinit = false isVar = false, isConst = false, isLateinit = false
).also { ).also {
delegateVariableForPropertyCache[symbol] = it.symbol delegateVariableForPropertyCache[symbol] = it.symbol
} }
delegate.parent = irParent delegate.parent = irParent
getter = createIrPropertyAccessor( getter = createIrPropertyAccessor(
property.getter, property, this, type, irParent, false, property.getter, property, this, type, irParent, false,
IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR, startOffset, endOffset, dontUseSignature = true
).also {
getterForPropertyCache[symbol] = it.symbol
}
if (property.isVar) {
setter = createIrPropertyAccessor(
property.setter, property, this, type, irParent, true,
IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR, startOffset, endOffset, dontUseSignature = true IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR, startOffset, endOffset, dontUseSignature = true
).also { ).also {
setterForPropertyCache[symbol] = it.symbol getterForPropertyCache[symbol] = it.symbol
} }
if (property.isVar) {
setter = createIrPropertyAccessor(
property.setter, property, this, type, irParent, true,
IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR, startOffset, endOffset, dontUseSignature = true
).also {
setterForPropertyCache[symbol] = it.symbol
}
}
annotationGenerator.generate(this, property)
} }
annotationGenerator.generate(this, property)
leaveScope(this.symbol)
} }
localStorage.putDelegatedProperty(property, irProperty) localStorage.putDelegatedProperty(property, irProperty)
return irProperty return irProperty