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

Pseudocode: Generate synthetic VALUE_CONSUMER for both property and class delegates

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-21 17:08:06 +04:00
parent d07deeb5fb
commit 2d3ac9109b
7 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+39 -15
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.SmartFMap; import com.intellij.util.SmartFMap;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import jet.runtime.typeinfo.JetValueParameter;
import kotlin.Function0; import kotlin.Function0;
import kotlin.Function1; import kotlin.Function1;
import kotlin.KotlinPackage; import kotlin.KotlinPackage;
@@ -548,7 +549,7 @@ public class JetControlFlowProcessor {
@NotNull Map<PseudoValue, ReceiverValue> receiverValues, @NotNull Map<PseudoValue, ReceiverValue> receiverValues,
@NotNull JetExpression parentExpression @NotNull JetExpression parentExpression
) { ) {
if (target == AccessTarget.BlackBox.instance$) { if (target == AccessTarget.BlackBox.INSTANCE$) {
List<PseudoValue> values = ContainerUtil.createMaybeSingletonList(rightValue); List<PseudoValue> values = ContainerUtil.createMaybeSingletonList(rightValue);
builder.magic(parentExpression, parentExpression, values, defaultTypeMap(values), MagicKind.UNSUPPORTED_ELEMENT); builder.magic(parentExpression, parentExpression, values, defaultTypeMap(values), MagicKind.UNSUPPORTED_ELEMENT);
} }
@@ -893,14 +894,8 @@ public class JetControlFlowProcessor {
JetMultiDeclaration multiDeclaration = expression.getMultiParameter(); JetMultiDeclaration multiDeclaration = expression.getMultiParameter();
JetExpression loopRange = expression.getLoopRange(); JetExpression loopRange = expression.getLoopRange();
TypePredicate loopRangeTypePredicate = AllTypes.INSTANCE$; TypePredicate loopRangeTypePredicate =
ResolvedCall<?> iteratorResolvedCall = trace.get(BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange); getTypePredicateByReceiverValue(trace.get(BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange));
if (iteratorResolvedCall != null) {
ReceiverValue iteratorReceiver = getExplicitReceiverValue(iteratorResolvedCall);
if (iteratorReceiver.exists()) {
loopRangeTypePredicate = PseudocodePackage.getReceiverTypePredicate(iteratorResolvedCall, iteratorReceiver);
}
}
PseudoValue loopRangeValue = builder.getBoundValue(loopRange); PseudoValue loopRangeValue = builder.getBoundValue(loopRange);
PseudoValue value = builder.magic( PseudoValue value = builder.magic(
@@ -1154,7 +1149,9 @@ public class JetControlFlowProcessor {
JetExpression delegate = property.getDelegateExpression(); JetExpression delegate = property.getDelegateExpression();
if (delegate != null) { if (delegate != null) {
generateInstructions(delegate); generateInstructions(delegate);
generateDelegateConsumer(property, delegate);
} }
if (JetPsiUtil.isLocal(property)) { if (JetPsiUtil.isLocal(property)) {
for (JetPropertyAccessor accessor : property.getAccessors()) { for (JetPropertyAccessor accessor : property.getAccessors()) {
generateInstructions(accessor); generateInstructions(accessor);
@@ -1162,6 +1159,36 @@ public class JetControlFlowProcessor {
} }
} }
private void generateDelegateConsumer(@NotNull JetProperty property, @NotNull JetExpression delegate) {
DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, property);
if (!(descriptor instanceof PropertyDescriptor)) return;
List<PseudoValue> values = Collections.singletonList(builder.getBoundValue(delegate));
List<TypePredicate> typePredicates = KotlinPackage.map(
((PropertyDescriptor) descriptor).getAccessors(),
new Function1<PropertyAccessorDescriptor, TypePredicate>() {
@Override
public TypePredicate invoke(PropertyAccessorDescriptor descriptor) {
return getTypePredicateByReceiverValue(trace.get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, descriptor));
}
}
);
Map<PseudoValue, TypePredicate> valuesToTypePredicates =
PseudocodePackage.expectedTypeFor(PseudocodePackage.and(typePredicates), values);
builder.magic(property, null, values, valuesToTypePredicates, MagicKind.VALUE_CONSUMER);
}
private TypePredicate getTypePredicateByReceiverValue(@Nullable ResolvedCall<?> resolvedCall) {
if (resolvedCall == null) return AllTypes.INSTANCE$;
ReceiverValue receiverValue = getExplicitReceiverValue(resolvedCall);
if (receiverValue.exists()) {
return PseudocodePackage.getReceiverTypePredicate(resolvedCall, receiverValue);
}
return AllTypes.INSTANCE$;
}
@Override @Override
public void visitMultiDeclaration(@NotNull JetMultiDeclaration declaration) { public void visitMultiDeclaration(@NotNull JetMultiDeclaration declaration) {
visitMultiDeclaration(declaration, true); visitMultiDeclaration(declaration, true);
@@ -1399,12 +1426,9 @@ public class JetControlFlowProcessor {
generateInstructions(specifier.getDelegateExpression()); generateInstructions(specifier.getDelegateExpression());
List<PseudoValue> arguments = ContainerUtil.createMaybeSingletonList(builder.getBoundValue(specifier.getDelegateExpression())); List<PseudoValue> arguments = ContainerUtil.createMaybeSingletonList(builder.getBoundValue(specifier.getDelegateExpression()));
TypePredicate expectedTypePredicate = JetType jetType = trace.get(BindingContext.TYPE, specifier.getTypeReference());
PseudocodePackage.getSubtypesPredicate(trace.get(BindingContext.TYPE, specifier.getTypeReference())); TypePredicate expectedTypePredicate = jetType != null ? PseudocodePackage.getSubtypesPredicate(jetType) : AllTypes.INSTANCE$;
if (expectedTypePredicate == null) { builder.magic(specifier, null, arguments, PseudocodePackage.expectedTypeFor(expectedTypePredicate, arguments), MagicKind.VALUE_CONSUMER);
expectedTypePredicate = AllTypes.INSTANCE$;
}
builder.magic(specifier, specifier, arguments, PseudocodePackage.expectedTypeFor(expectedTypePredicate, arguments), MagicKind.VALUE_CONSUMER);
} }
@Override @Override
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
+1 -1
View File
@@ -72,7 +72,7 @@ fun or(predicates: Collection<TypePredicate>): TypePredicate? =
else -> ForSomeType(predicates.toList()) else -> ForSomeType(predicates.toList())
} }
fun JetType.getSubtypesPredicate(): TypePredicate? { fun JetType.getSubtypesPredicate(): TypePredicate {
return when { return when {
KotlinBuiltIns.getInstance().isAnyOrNullableAny(this) && isNullable() -> AllTypes KotlinBuiltIns.getInstance().isAnyOrNullableAny(this) && isNullable() -> AllTypes
TypeUtils.canHaveSubtypes(JetTypeChecker.DEFAULT, this) -> AllSubtypes(this) TypeUtils.canHaveSubtypes(JetTypeChecker.DEFAULT, this) -> AllSubtypes(this)
compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.values
+10 -10
View File
@@ -11,14 +11,14 @@ class A(a: Int, b: Int): T
== B == == B ==
class B(a: Int, b: Int): T by A(a + b, a - b) class B(a: Int, b: Int): T by A(a + b, a - b)
--------------------- ---------------------
<v0>: Int NEW: magic[FAKE_INITIALIZER](a: Int) -> <v0> <v0>: Int NEW: magic[FAKE_INITIALIZER](a: Int) -> <v0>
<v1>: Int NEW: magic[FAKE_INITIALIZER](b: Int) -> <v1> <v1>: Int NEW: magic[FAKE_INITIALIZER](b: Int) -> <v1>
a <v2>: Int NEW: r(a) -> <v2> <v9>: * NEW: magic[VALUE_CONSUMER](T by A(a + b, a - b)|<v8>) -> <v9>
b <v3>: Int NEW: r(b) -> <v3> a <v2>: Int NEW: r(a) -> <v2>
a + b <v4>: Int NEW: call(a + b, plus|<v2>, <v3>) -> <v4> b <v3>: Int NEW: r(b) -> <v3>
a <v5>: Int NEW: r(a) -> <v5> a + b <v4>: Int NEW: call(a + b, plus|<v2>, <v3>) -> <v4>
b <v6>: Int NEW: r(b) -> <v6> a <v5>: Int NEW: r(a) -> <v5>
a - b <v7>: Int NEW: call(a - b, minus|<v5>, <v6>) -> <v7> b <v6>: Int NEW: r(b) -> <v6>
A(a + b, a - b) <v8>: {<: T} NEW: call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8> a - b <v7>: Int NEW: call(a - b, minus|<v5>, <v6>) -> <v7>
T by A(a + b, a - b) <v9>: * NEW: magic[VALUE_CONSUMER](T by A(a + b, a - b)|<v8>) -> <v9> A(a + b, a - b) <v8>: {<: T} NEW: call(A(a + b, a - b), <init>|<v4>, <v7>) -> <v8>
===================== =====================
compiler/testData/cfg/declarations/local/ObjectExpression.values
+3 -3
View File
@@ -26,9 +26,9 @@ fun foo(b: B) : Int {
} }
--------------------- ---------------------
<v0>: B NEW: magic[FAKE_INITIALIZER](b: B) -> <v0> <v0>: B NEW: magic[FAKE_INITIALIZER](b: B) -> <v0>
b <v1>: {<: A} NEW: r(b) -> <v1> <v2>: * NEW: magic[VALUE_CONSUMER](A by b|<v1>) -> <v2>
A by b <v2>: * NEW: magic[VALUE_CONSUMER](A by b|<v1>) -> <v2> b <v1>: {<: A} NEW: r(b) -> <v1>
object : A by b {} <v3>: <no name provided> NEW: r(object : A by b {}) -> <v3> object : A by b {} <v3>: <no name provided> NEW: r(object : A by b {}) -> <v3>
o <v4>: {<: A} NEW: r(o) -> <v4> o <v4>: {<: A} NEW: r(o) -> <v4>
foo() <v5>: Int NEW: call(foo(), foo|<v4>) -> <v5> foo() <v5>: Int NEW: call(foo(), foo|<v4>) -> <v5>
o.foo() <v5>: Int COPY o.foo() <v5>: Int COPY
compiler/testData/cfg/declarations/properties/DelegatedProperty.instructions
+8 -7
View File
@@ -1,6 +1,6 @@
== Delegate == == Delegate ==
class Delegate { class Delegate {
fun get(_this: Any, p: PropertyMetadata): Int = 0 fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
} }
--------------------- ---------------------
L0: L0:
@@ -13,12 +13,12 @@ sink:
<SINK> PREV:[<ERROR>, <END>] <SINK> PREV:[<ERROR>, <END>]
===================== =====================
== get == == get ==
fun get(_this: Any, p: PropertyMetadata): Int = 0 fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
--------------------- ---------------------
L0: L0:
1 <START> 1 <START>
v(_this: Any) v(_this: Nothing?)
magic[FAKE_INITIALIZER](_this: Any) -> <v0> magic[FAKE_INITIALIZER](_this: Nothing?) -> <v0>
w(_this|<v0>) w(_this|<v0>)
v(p: PropertyMetadata) v(p: PropertyMetadata)
magic[FAKE_INITIALIZER](p: PropertyMetadata) -> <v1> magic[FAKE_INITIALIZER](p: PropertyMetadata) -> <v1>
@@ -55,10 +55,11 @@ L0:
1 <START> 1 <START>
v(val b by a) v(val b by a)
r(a) -> <v0> r(a) -> <v0>
magic[VALUE_CONSUMER](val b by a|<v0>) -> <v1>
L1: L1:
<END> NEXT:[<SINK>] <END> NEXT:[<SINK>]
error: error:
<ERROR> PREV:[] <ERROR> PREV:[]
sink: sink:
<SINK> PREV:[<ERROR>, <END>] <SINK> PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/declarations/properties/DelegatedProperty.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate { class Delegate {
fun get(_this: Any, p: PropertyMetadata): Int = 0 fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
} }
val a = Delegate() val a = Delegate()
compiler/testData/cfg/declarations/properties/DelegatedProperty.values
+5 -4
View File
@@ -1,13 +1,13 @@
== Delegate == == Delegate ==
class Delegate { class Delegate {
fun get(_this: Any, p: PropertyMetadata): Int = 0 fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
} }
--------------------- ---------------------
===================== =====================
== get == == get ==
fun get(_this: Any, p: PropertyMetadata): Int = 0 fun get(_this: Nothing?, p: PropertyMetadata): Int = 0
--------------------- ---------------------
<v0>: {<: Any} NEW: magic[FAKE_INITIALIZER](_this: Any) -> <v0> <v0>: {<: Nothing?} NEW: magic[FAKE_INITIALIZER](_this: Nothing?) -> <v0>
<v1>: {<: PropertyMetadata} NEW: magic[FAKE_INITIALIZER](p: PropertyMetadata) -> <v1> <v1>: {<: PropertyMetadata} NEW: magic[FAKE_INITIALIZER](p: PropertyMetadata) -> <v1>
0 <v2>: Int NEW: r(0) -> <v2> 0 <v2>: Int NEW: r(0) -> <v2>
===================== =====================
@@ -19,5 +19,6 @@ Delegate() <v0>: Delegate NEW: call(Delegate(), <init>) -> <v0>
== b == == b ==
val b by a val b by a
--------------------- ---------------------
a <v0>: * NEW: r(a) -> <v0> <v1>: * NEW: magic[VALUE_CONSUMER](val b by a|<v0>) -> <v1>
a <v0>: Delegate NEW: r(a) -> <v0>
===================== =====================