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

[PSI2IR] Additional receiver -> context receiver

Browse Source
This commit is contained in:
Anastasiya Shadrina
2021-10-18 18:50:42 +07:00
committed by TeamCityServer
parent 3f50b675b1
commit f05ca5be33
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
+2 -2
View File
@@ -184,7 +184,7 @@ class BodyGenerator(
val classDescriptor = (scopeOwner as ClassConstructorDescriptor).containingDeclaration
if (classDescriptor.contextReceivers.isNotEmpty()) {
generateSetAdditionalFieldForPrimaryConstructorBody(classDescriptor, irConstructor, irBlockBody)
generateSetContextReceiverFieldForPrimaryConstructorBody(classDescriptor, irConstructor, irBlockBody)
}
irBlockBody.statements.add(
IrInstanceInitializerCallImpl(
@@ -334,7 +334,7 @@ class BodyGenerator(
pregenerateCall(constructorCall)
)
private fun generateSetAdditionalFieldForPrimaryConstructorBody(
private fun generateSetContextReceiverFieldForPrimaryConstructorBody(
classDescriptor: ClassDescriptor,
irConstructor: IrConstructor,
irBlockBody: IrBlockBody
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+3 -3
View File
@@ -98,7 +98,7 @@ class ClassGenerator(
classDescriptor.thisAsReceiverParameter.type.toIrType()
)
generateFieldsForAdditionalReceivers(irClass, classDescriptor)
generateFieldsForContextReceivers(irClass, classDescriptor)
val irPrimaryConstructor = generatePrimaryConstructor(irClass, ktClassOrObject)
if (irPrimaryConstructor != null) {
@@ -434,13 +434,13 @@ class ClassGenerator(
EnumClassMembersGenerator(declarationGenerator).generateSpecialMembers(irClass)
}
private fun generateFieldsForAdditionalReceivers(irClass: IrClass, classDescriptor: ClassDescriptor) {
private fun generateFieldsForContextReceivers(irClass: IrClass, classDescriptor: ClassDescriptor) {
for ((fieldIndex, receiverDescriptor) in classDescriptor.contextReceivers.withIndex()) {
val irField = context.irFactory.createField(
UNDEFINED_OFFSET, UNDEFINED_OFFSET,
IrDeclarationOrigin.FIELD_FOR_CLASS_CONTEXT_RECEIVER,
IrFieldSymbolImpl(),
Name.identifier("additionalReceiverField$fieldIndex"),
Name.identifier("contextReceiverField$fieldIndex"),
receiverDescriptor.type.toIrType(),
DescriptorVisibilities.PRIVATE,
isFinal = true,
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DescriptorStorageForAdditionalReceivers.kt → compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DescriptorStorageForContextReceivers.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.declarations.IrField
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
class DescriptorStorageForAdditionalReceivers {
class DescriptorStorageForContextReceivers {
private val variableStorage: MutableMap<KtExpression, VariableDescriptor> = mutableMapOf()
private val syntheticFieldStorage: MutableMap<ReceiverValue, IrField> = mutableMapOf()
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
+2 -2
View File
@@ -329,8 +329,8 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
val contextReceiverParametersCount = functionDescriptor.contextReceiverParameters.size
irFunction.contextReceiverParametersCount = contextReceiverParametersCount
irFunction.valueParameters += functionDescriptor.contextReceiverParameters.mapIndexed { i, additionalReceiver ->
declareParameter(additionalReceiver, ktContextReceiverParameterElements.getOrNull(i) ?: ktParameterOwner, irFunction, null, i)
irFunction.valueParameters += functionDescriptor.contextReceiverParameters.mapIndexed { i, contextReceiver ->
declareParameter(contextReceiver, ktContextReceiverParameterElements.getOrNull(i) ?: ktParameterOwner, irFunction, null, i)
}
// Declare all the value parameters up first.
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorContext.kt
+1 -1
View File
@@ -71,7 +71,7 @@ class GeneratorContext private constructor(
// TODO: inject a correct StorageManager instance, or store NotFoundClasses inside ModuleDescriptor
val reflectionTypes = ReflectionTypes(moduleDescriptor, NotFoundClasses(LockBasedStorageManager.NO_LOCKS, moduleDescriptor))
val additionalDescriptorStorage: DescriptorStorageForAdditionalReceivers = DescriptorStorageForAdditionalReceivers()
val additionalDescriptorStorage: DescriptorStorageForContextReceivers = DescriptorStorageForContextReceivers()
val samTypeApproximator = SamTypeApproximator(moduleDescriptor.builtIns, languageVersionSettings)
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/intermediate/PropertyLValue.kt
+1 -1
View File
@@ -52,7 +52,7 @@ abstract class PropertyLValueBase(
val extensionReceiverValue2 = extensionReceiverVariable2?.let { VariableLValue(context, it) }
val contextReceiverVariables2 = contextReceiverValues.mapIndexed { i, value ->
scope.createTemporaryVariable(value.load(), "additionalReceiver$i")
scope.createTemporaryVariable(value.load(), "contextReceiver$i")
}
val contextReceiversValues2 = contextReceiverVariables2.map { VariableLValue(context, it) }
compiler/testData/ir/irText/declarations/contextReceivers/class.kt.txt
Vendored
+3 -3
View File
@@ -12,16 +12,16 @@ class Outer {
}
class Inner {
private /* final field */ val additionalReceiverField0: Outer
private /* final field */ val contextReceiverField0: Outer
constructor(<this>: Outer, arg: Any) /* primary */ {
super/*Any*/()
<this>.#additionalReceiverField0 = <this>
<this>.#contextReceiverField0 = <this>
/* <init>() */
}
fun bar(): Int {
return <this>.#additionalReceiverField0.<get-x>()
return <this>.#contextReceiverField0.<get-x>()
}
}
compiler/testData/ir/irText/declarations/contextReceivers/class.txt
Vendored
+3 -3
View File
@@ -31,13 +31,13 @@ FILE fqName:<root> fileName:/class.kt
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:Inner modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Inner
FIELD FIELD_FOR_CLASS_CONTEXT_RECEIVER name:additionalReceiverField0 type:<root>.Outer visibility:private [final]
FIELD FIELD_FOR_CLASS_CONTEXT_RECEIVER name:contextReceiverField0 type:<root>.Outer visibility:private [final]
CONSTRUCTOR visibility:public <> (<this>:<root>.Outer, arg:kotlin.Any) returnType:<root>.Inner [primary]
VALUE_PARAMETER name:<this> index:0 type:<root>.Outer
VALUE_PARAMETER name:arg index:1 type:kotlin.Any
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
SET_FIELD 'FIELD FIELD_FOR_CLASS_CONTEXT_RECEIVER name:additionalReceiverField0 type:<root>.Outer visibility:private [final]' type=kotlin.Unit origin=null
SET_FIELD 'FIELD FIELD_FOR_CLASS_CONTEXT_RECEIVER name:contextReceiverField0 type:<root>.Outer visibility:private [final]' type=kotlin.Unit origin=null
receiver: GET_VAR '<this>: <root>.Inner declared in <root>.Inner' type=<root>.Inner origin=null
value: GET_VAR '<this>: <root>.Outer declared in <root>.Inner.<init>' type=<root>.Outer origin=null
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/class.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun bar (): kotlin.Int declared in <root>.Inner'
CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.Outer' type=kotlin.Int origin=GET_PROPERTY
$this: GET_FIELD 'FIELD FIELD_FOR_CLASS_CONTEXT_RECEIVER name:additionalReceiverField0 type:<root>.Outer visibility:private [final]' type=<root>.Outer origin=null
$this: GET_FIELD 'FIELD FIELD_FOR_CLASS_CONTEXT_RECEIVER name:contextReceiverField0 type:<root>.Outer visibility:private [final]' type=<root>.Outer origin=null
receiver: GET_VAR '<this>: <root>.Inner declared in <root>.Inner.bar' type=<root>.Inner origin=null
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
overridden:
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassConstructorDescriptorImpl.java
+2 -2
View File
@@ -70,7 +70,7 @@ public class ClassConstructorDescriptorImpl extends FunctionDescriptorImpl imple
@NotNull List<TypeParameterDescriptor> typeParameterDescriptors
) {
super.initialize(
null, calculateDispatchReceiverParameter(), calculateAdditionalReceiverParameters(),
null, calculateDispatchReceiverParameter(), calculateContextReceiverParameters(),
typeParameterDescriptors,
unsubstitutedValueParameters, null,
Modality.FINAL, visibility);
@@ -98,7 +98,7 @@ public class ClassConstructorDescriptorImpl extends FunctionDescriptorImpl imple
}
@NotNull
List<ReceiverParameterDescriptor> calculateAdditionalReceiverParameters() {
private List<ReceiverParameterDescriptor> calculateContextReceiverParameters() {
ClassDescriptor classDescriptor = getContainingDeclaration();
if (!classDescriptor.getContextReceivers().isEmpty()) {
return classDescriptor.getContextReceivers();