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

Pseudocode: Generate magics for cast expressions

Browse Source
This commit is contained in:
Alexey Sedunov
2014-07-18 21:02:45 +04:00
parent 00dd1dbb0b
commit c32d112e67
7 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+3 -1
View File
@@ -1203,7 +1203,9 @@ public class JetControlFlowProcessor {
JetExpression left = expression.getLeft();
if (operationType == JetTokens.COLON || operationType == JetTokens.AS_KEYWORD || operationType == JetTokens.AS_SAFE) {
generateInstructions(left);
copyValue(left, expression);
if (builder.getBoundValue(left) != null) {
createNonSyntheticValue(expression, MagicKind.CAST, left);
}
}
else {
visitJetElement(expression);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
+1
View File
@@ -139,6 +139,7 @@ public enum class MagicKind {
NOT_NULL_ASSERTION
EQUALS_IN_WHEN_CONDITION
IS
CAST
CALLABLE_REFERENCE
// implicit operations
LOOP_RANGE_ITERATION
compiler/testData/cfg/expressions/casts.instructions
+29
View File
@@ -0,0 +1,29 @@
== foo ==
fun foo(a: Any) {
a : String
a as String
a as? String
}
---------------------
L0:
1 <START>
v(a: Any)
magic[FAKE_INITIALIZER](a: Any) -> <v0>
w(a|<v0>)
2 mark({ a : String a as String a as? String })
mark(a : String)
r(a) -> <v1>
magic[CAST](a : String|<v1>) -> <v2>
mark(a as String)
r(a) -> <v3>
magic[CAST](a as String|<v3>) -> <v4>
mark(a as? String)
r(a) -> <v5>
magic[CAST](a as? String|<v5>) -> <v6>
L1:
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/expressions/casts.kt
+5
View File
@@ -0,0 +1,5 @@
fun foo(a: Any) {
a : String
a as String
a as? String
}
compiler/testData/cfg/expressions/casts.values
+16
View File
@@ -0,0 +1,16 @@
== foo ==
fun foo(a: Any) {
a : String
a as String
a as? String
}
---------------------
<v0>: {<: Any} NEW: magic[FAKE_INITIALIZER](a: Any) -> <v0>
a <v1>: * NEW: r(a) -> <v1>
a : String <v2>: * NEW: magic[CAST](a : String|<v1>) -> <v2>
a <v3>: * NEW: r(a) -> <v3>
a as String <v4>: * NEW: magic[CAST](a as String|<v3>) -> <v4>
a <v5>: * NEW: r(a) -> <v5>
a as? String <v6>: * NEW: magic[CAST](a as? String|<v5>) -> <v6>
{ a : String a as String a as? String } <v6>: * COPY
=====================
compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
+5
View File
@@ -374,6 +374,11 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
doTest("compiler/testData/cfg/expressions/callableReferences.kt");
}
@TestMetadata("casts.kt")
public void testCasts() throws Exception {
doTest("compiler/testData/cfg/expressions/casts.kt");
}
@TestMetadata("chainedQualifiedExpression.kt")
public void testChainedQualifiedExpression() throws Exception {
doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
+5
View File
@@ -378,6 +378,11 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
doTest("compiler/testData/cfg/expressions/callableReferences.kt");
}
@TestMetadata("casts.kt")
public void testCasts() throws Exception {
doTest("compiler/testData/cfg/expressions/casts.kt");
}
@TestMetadata("chainedQualifiedExpression.kt")
public void testChainedQualifiedExpression() throws Exception {
doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");