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

Removed dispatch receiver parameter for SyntheticFieldDescriptor

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-10-12 19:55:15 +03:00
parent 553834fa9e
commit ff00bde607
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+6 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.codegen.intrinsics.JavaClassProperty;
import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor; import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor;
import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtExpression;
@@ -493,10 +494,14 @@ public abstract class StackValue {
@Nullable Callable callableMethod @Nullable Callable callableMethod
) { ) {
ReceiverValue callDispatchReceiver = resolvedCall.getDispatchReceiver(); ReceiverValue callDispatchReceiver = resolvedCall.getDispatchReceiver();
CallableDescriptor descriptor = resolvedCall.getResultingDescriptor();
if (descriptor instanceof SyntheticFieldDescriptor) {
callDispatchReceiver = ((SyntheticFieldDescriptor) descriptor).getDispatchReceiverForBackend();
}
ReceiverValue callExtensionReceiver = resolvedCall.getExtensionReceiver(); ReceiverValue callExtensionReceiver = resolvedCall.getExtensionReceiver();
if (callDispatchReceiver.exists() || callExtensionReceiver.exists() if (callDispatchReceiver.exists() || callExtensionReceiver.exists()
|| isLocalFunCall(callableMethod) || isCallToMemberObjectImportedByName(resolvedCall)) { || isLocalFunCall(callableMethod) || isCallToMemberObjectImportedByName(resolvedCall)) {
CallableDescriptor descriptor = resolvedCall.getResultingDescriptor();
ReceiverParameterDescriptor dispatchReceiverParameter = descriptor.getDispatchReceiverParameter(); ReceiverParameterDescriptor dispatchReceiverParameter = descriptor.getDispatchReceiverParameter();
ReceiverParameterDescriptor extensionReceiverParameter = descriptor.getExtensionReceiverParameter(); ReceiverParameterDescriptor extensionReceiverParameter = descriptor.getExtensionReceiverParameter();
compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/SyntheticFieldDescriptor.kt
+4 -1
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.kotlin.resolve.source.toSourceElement import org.jetbrains.kotlin.resolve.source.toSourceElement
class SyntheticFieldDescriptor private constructor( class SyntheticFieldDescriptor private constructor(
@@ -34,7 +35,9 @@ class SyntheticFieldDescriptor private constructor(
constructor(accessorDescriptor: PropertyAccessorDescriptor, constructor(accessorDescriptor: PropertyAccessorDescriptor,
property: KtProperty): this(accessorDescriptor.correspondingProperty, accessorDescriptor, property) property: KtProperty): this(accessorDescriptor.correspondingProperty, accessorDescriptor, property)
override fun getDispatchReceiverParameter() = propertyDescriptor.dispatchReceiverParameter override fun getDispatchReceiverParameter() = null
fun getDispatchReceiverForBackend() = propertyDescriptor.dispatchReceiverParameter?.value ?: ReceiverValue.NO_RECEIVER
companion object { companion object {
val NAME = Name.identifier("field") val NAME = Name.identifier("field")
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.instructions
Vendored
+8 -10
View File
@@ -34,17 +34,16 @@ get() {
} }
--------------------- ---------------------
L3: L3:
3 <START> INIT: in: {} out: {} 3 <START> INIT: in: {} out: {}
4 mark({ return field }) 4 mark({ return field }) USE: in: {field=READ} out: {field=READ}
magic[IMPLICIT_RECEIVER](field) -> <v0> USE: in: {field=READ} out: {field=READ} r(field) -> <v0> USE: in: {} out: {field=READ}
r(field|<v0>) -> <v1> USE: in: {} out: {field=READ} ret(*|<v0>) L4
ret(*|<v1>) L4
L4: L4:
3 <END> 3 <END>
error: error:
<ERROR> <ERROR>
sink: sink:
<SINK> USE: in: {} out: {} <SINK> USE: in: {} out: {}
===================== =====================
== set_a == == set_a ==
set(v: Int) { set(v: Int) {
@@ -56,10 +55,9 @@ L6:
v(v: Int) INIT: in: {} out: {v=D} v(v: Int) INIT: in: {} out: {v=D}
magic[FAKE_INITIALIZER](v: Int) -> <v0> INIT: in: {v=D} out: {v=D} magic[FAKE_INITIALIZER](v: Int) -> <v0> INIT: in: {v=D} out: {v=D}
w(v|<v0>) INIT: in: {v=D} out: {v=ID} w(v|<v0>) INIT: in: {v=D} out: {v=ID}
4 mark({ field = v }) INIT: in: {v=ID} out: {v=ID} 4 mark({ field = v }) INIT: in: {v=ID} out: {v=ID} USE: in: {field=ONLY_WRITTEN_NEVER_READ, v=READ} out: {field=ONLY_WRITTEN_NEVER_READ, v=READ}
magic[IMPLICIT_RECEIVER](field) -> <v1> USE: in: {field=ONLY_WRITTEN_NEVER_READ, v=READ} out: {field=ONLY_WRITTEN_NEVER_READ, v=READ} r(v) -> <v1> USE: in: {field=ONLY_WRITTEN_NEVER_READ} out: {field=ONLY_WRITTEN_NEVER_READ, v=READ}
r(v) -> <v2> USE: in: {field=ONLY_WRITTEN_NEVER_READ} out: {field=ONLY_WRITTEN_NEVER_READ, v=READ} w(field|<v1>) INIT: in: {v=ID} out: {field=I, v=ID} USE: in: {} out: {field=ONLY_WRITTEN_NEVER_READ}
w(field|<v1>, <v2>) INIT: in: {v=ID} out: {field=I, v=ID} USE: in: {} out: {field=ONLY_WRITTEN_NEVER_READ}
L7: L7:
3 <END> INIT: in: {field=I, v=ID} out: {field=I, v=ID} 3 <END> INIT: in: {field=I, v=ID} out: {field=I, v=ID}
error: error:
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
Vendored
+6 -8
View File
@@ -17,10 +17,9 @@ get() {
return field return field
} }
--------------------- ---------------------
<v0>: A NEW: magic[IMPLICIT_RECEIVER](field) -> <v0> field <v0>: Int NEW: r(field) -> <v0>
field <v1>: Int NEW: r(field|<v0>) -> <v1> return field !<v1>: *
return field !<v2>: * { return field } !<v1>: * COPY
{ return field } !<v2>: * COPY
===================== =====================
== set_a == == set_a ==
set(v: Int) { set(v: Int) {
@@ -28,8 +27,7 @@ set(v: Int) {
} }
--------------------- ---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](v: Int) -> <v0> <v0>: Int NEW: magic[FAKE_INITIALIZER](v: Int) -> <v0>
<v1>: A NEW: magic[IMPLICIT_RECEIVER](field) -> <v1> v <v1>: Int NEW: r(v) -> <v1>
v <v2>: Int NEW: r(v) -> <v2> field = v !<v2>: *
field = v !<v3>: * { field = v } !<v2>: * COPY
{ field = v } !<v3>: * COPY
===================== =====================