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

added edge 'error' -> 'sink'

Browse Source 
added 'getLocalDeclarations' method to pseudocode
This commit is contained in:
Svetlana Isakova
2012-05-25 21:18:00 +04:00
parent 5c7b787e68
commit edb529f68f
16 changed files with 143 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java
+15 -5
View File
@@ -17,16 +17,14 @@
package org.jetbrains.jet.lang.cfg.pseudocode; package org.jetbrains.jet.lang.cfg.pseudocode;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.cfg.Label; import org.jetbrains.jet.lang.cfg.Label;
import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetElement;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Set;
/** /**
* @author abreslav * @author abreslav
@@ -95,6 +93,17 @@ public class Pseudocode {
return correspondingElement; return correspondingElement;
} }
public Set<Pseudocode> getLocalDeclarations() {
Set<Pseudocode> localDeclarations = Sets.newLinkedHashSet();
//todo look recursively inside local declarations
for (Instruction instruction : instructions) {
if (instruction instanceof LocalDeclarationInstruction) {
localDeclarations.add(((LocalDeclarationInstruction) instruction).getBody());
}
}
return localDeclarations;
}
public PseudocodeLabel createLabel(String name) { public PseudocodeLabel createLabel(String name) {
PseudocodeLabel label = new PseudocodeLabel(name); PseudocodeLabel label = new PseudocodeLabel(name);
labels.add(label); labels.add(label);
@@ -190,10 +199,11 @@ public class Pseudocode {
public void postProcess() { public void postProcess() {
if (postPrecessed) return; if (postPrecessed) return;
postPrecessed = true; postPrecessed = true;
errorInstruction.setSink(getSinkInstruction());
exitInstruction.setSink(getSinkInstruction());
for (int i = 0, instructionsSize = mutableInstructionList.size(); i < instructionsSize; i++) { for (int i = 0, instructionsSize = mutableInstructionList.size(); i < instructionsSize; i++) {
processInstruction(mutableInstructionList.get(i), i); processInstruction(mutableInstructionList.get(i), i);
} }
getExitInstruction().setSink(getSinkInstruction());
Set<Instruction> reachableInstructions = collectReachableInstructions(); Set<Instruction> reachableInstructions = collectReachableInstructions();
for (Instruction instruction : mutableInstructionList) { for (Instruction instruction : mutableInstructionList) {
if (reachableInstructions.contains(instruction)) { if (reachableInstructions.contains(instruction)) {
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/SubroutineExitInstruction.java
+2 -4
View File
@@ -46,10 +46,8 @@ public class SubroutineExitInstruction extends InstructionImpl {
@NotNull @NotNull
@Override @Override
public Collection<Instruction> getNextInstructions() { public Collection<Instruction> getNextInstructions() {
if (sinkInstruction != null) { assert sinkInstruction != null;
return Collections.<Instruction>singleton(sinkInstruction); return Collections.<Instruction>singleton(sinkInstruction);
}
return Collections.emptyList();
} }
@Override @Override
compiler/testData/cfg/AnonymousInitializers.instructions
+6 -6
View File
@@ -7,9 +7,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r(20)] <END> NEXT:[<SINK>] PREV:[r(20)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== AnonymousInitializers == == AnonymousInitializers ==
class AnonymousInitializers() { class AnonymousInitializers() {
@@ -46,16 +46,16 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w($i)] <END> NEXT:[<SINK>] PREV:[w($i)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d(get() = 20), <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d(get() = 20)]
l3: l3:
<START> NEXT:[r(20)] PREV:[] <START> NEXT:[r(20)] PREV:[]
r(20) NEXT:[<END>] PREV:[<START>] r(20) NEXT:[<END>] PREV:[<START>]
l4: l4:
<END> NEXT:[<SINK>] PREV:[r(20)] <END> NEXT:[<SINK>] PREV:[r(20)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/ArrayAccess.instructions
+2 -2
View File
@@ -35,7 +35,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a[10])] <END> NEXT:[<SINK>] PREV:[w(a[10])]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/Assignments.instructions
+4 -4
View File
@@ -9,9 +9,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[v(var x : Int;)] <END> NEXT:[<SINK>] PREV:[v(var x : Int;)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== assignments == == assignments ==
fun assignments() : Unit { fun assignments() : Unit {
@@ -72,7 +72,7 @@ l5:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(t.x)] <END> NEXT:[<SINK>] PREV:[w(t.x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/Basic.instructions
+12 -12
View File
@@ -7,9 +7,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[r(1)] <END> NEXT:[<SINK>] PREV:[r(1)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== f == == f ==
fun f(a : Boolean) : Unit { fun f(a : Boolean) : Unit {
@@ -78,18 +78,18 @@ l6:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r(a || false)] <END> NEXT:[<SINK>] PREV:[r(a || false)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d({1}), <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d({1})]
l3: l3:
<START> NEXT:[r(1)] PREV:[] <START> NEXT:[r(1)] PREV:[]
r(1) NEXT:[<END>] PREV:[<START>] r(1) NEXT:[<END>] PREV:[<START>]
l4: l4:
<END> NEXT:[<SINK>] PREV:[r(1)] <END> NEXT:[<SINK>] PREV:[r(1)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== foo == == foo ==
fun foo(a : Boolean, b : Int) : Unit {} fun foo(a : Boolean, b : Int) : Unit {}
@@ -104,9 +104,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== genfun == == genfun ==
fun genfun<T>() : Unit {} fun genfun<T>() : Unit {}
@@ -117,9 +117,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== flfun == == flfun ==
fun flfun(f : () -> Any) : Unit {} fun flfun(f : () -> Any) : Unit {}
@@ -132,7 +132,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/EmptyFunction.instructions
+2 -2
View File
@@ -7,7 +7,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/FailFunction.instructions
+2 -2
View File
@@ -15,7 +15,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[] <END> NEXT:[<SINK>] PREV:[]
error: error:
<ERROR> NEXT:[] PREV:[jmp(error)] <ERROR> NEXT:[<SINK>] PREV:[jmp(error)]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/Finally.instructions
+42 -42
View File
@@ -21,9 +21,9 @@ l1:
l3: l3:
<END> NEXT:[<SINK>] PREV:[r(2)] <END> NEXT:[<SINK>] PREV:[r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t2 == == t2 ==
fun t2() { fun t2() {
@@ -65,9 +65,9 @@ l1:
l5: l5:
<END> NEXT:[<SINK>] PREV:[ret l1, r(2)] <END> NEXT:[<SINK>] PREV:[ret l1, r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== anonymous_0 == == anonymous_0 ==
{ () => { () =>
@@ -92,9 +92,9 @@ l4:
l6: l6:
<END> NEXT:[<SINK>] PREV:[ret l4, read (Unit)] <END> NEXT:[<SINK>] PREV:[ret l4, read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t3 == == t3 ==
fun t3() { fun t3() {
@@ -141,9 +141,9 @@ l1:
l8: l8:
<END> NEXT:[<SINK>] PREV:[r(2)] <END> NEXT:[<SINK>] PREV:[r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d({ () => if (2 > 3) { retur..), <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d({ () => if (2 > 3) { retur..)]
l3: l3:
<START> NEXT:[r(())] PREV:[] <START> NEXT:[r(())] PREV:[]
r(()) NEXT:[r(2)] PREV:[<START>] r(()) NEXT:[r(2)] PREV:[<START>]
@@ -160,9 +160,9 @@ l4:
l6: l6:
<END> NEXT:[<SINK>] PREV:[ret l4, read (Unit)] <END> NEXT:[<SINK>] PREV:[ret l4, read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== anonymous_1 == == anonymous_1 ==
{ () => { () =>
@@ -205,9 +205,9 @@ l4:
l8: l8:
<END> NEXT:[<SINK>] PREV:[ret l4, r(2)] <END> NEXT:[<SINK>] PREV:[ret l4, r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t4 == == t4 ==
fun t4() { fun t4() {
@@ -250,9 +250,9 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r({ () => try { 1 if (2 > 3)..)] <END> NEXT:[<SINK>] PREV:[r({ () => try { 1 if (2 > 3)..)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d({ () => try { 1 if (2 > 3)..), <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d({ () => try { 1 if (2 > 3)..)]
l3: l3:
<START> NEXT:[r(())] PREV:[] <START> NEXT:[r(())] PREV:[]
r(()) NEXT:[r(try { 1 if (2 > 3) { retur..)] PREV:[<START>] r(()) NEXT:[r(try { 1 if (2 > 3) { retur..)] PREV:[<START>]
@@ -282,9 +282,9 @@ l4:
l8: l8:
<END> NEXT:[<SINK>] PREV:[ret l4, r(2)] <END> NEXT:[<SINK>] PREV:[ret l4, r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t5 == == t5 ==
fun t5() { fun t5() {
@@ -346,9 +346,9 @@ l3:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t6 == == t6 ==
fun t6() { fun t6() {
@@ -410,9 +410,9 @@ l1:
l9: l9:
<END> NEXT:[<SINK>] PREV:[r(2)] <END> NEXT:[<SINK>] PREV:[r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t7 == == t7 ==
fun t7() { fun t7() {
@@ -471,9 +471,9 @@ l1:
l9: l9:
<END> NEXT:[<SINK>] PREV:[r(2)] <END> NEXT:[<SINK>] PREV:[r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t8 == == t8 ==
fun t8(a : Int) { fun t8(a : Int) {
@@ -542,9 +542,9 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t9 == == t9 ==
fun t9(a : Int) { fun t9(a : Int) {
@@ -613,9 +613,9 @@ l1:
l9: l9:
<END> NEXT:[<SINK>] PREV:[r(2)] <END> NEXT:[<SINK>] PREV:[r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t10 == == t10 ==
fun t10(a : Int) { fun t10(a : Int) {
@@ -681,9 +681,9 @@ l1:
l9: l9:
<END> NEXT:[<SINK>] PREV:[r(2)] <END> NEXT:[<SINK>] PREV:[r(2)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t11 == == t11 ==
fun t11() { fun t11() {
@@ -714,9 +714,9 @@ l1:
l3: l3:
<END> NEXT:[<SINK>] PREV:[ret(*) l1] <END> NEXT:[<SINK>] PREV:[ret(*) l1]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t12 == == t12 ==
fun t12() : Int { fun t12() : Int {
@@ -749,9 +749,9 @@ l1:
l3: l3:
<END> NEXT:[<SINK>] PREV:[ret(*) l1] <END> NEXT:[<SINK>] PREV:[ret(*) l1]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t13 == == t13 ==
fun t13() : Int { fun t13() : Int {
@@ -802,9 +802,9 @@ l1:
l6: l6:
<END> NEXT:[<SINK>] PREV:[ret(*) l1, r(doSmth(3))] <END> NEXT:[<SINK>] PREV:[ret(*) l1, r(doSmth(3))]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t14 == == t14 ==
fun t14() : Int { fun t14() : Int {
@@ -843,9 +843,9 @@ l4:
l6: l6:
<END> NEXT:[<SINK>] PREV:[ret(*) l1, jmp(l4)] <END> NEXT:[<SINK>] PREV:[ret(*) l1, jmp(l4)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t15 == == t15 ==
fun t15() : Int { fun t15() : Int {
@@ -898,9 +898,9 @@ l1:
l6: l6:
<END> NEXT:[<SINK>] PREV:[ret(*) l1, ret(*) l1] <END> NEXT:[<SINK>] PREV:[ret(*) l1, ret(*) l1]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t16 == == t16 ==
fun t16() : Int { fun t16() : Int {
@@ -951,9 +951,9 @@ l1:
l6: l6:
<END> NEXT:[<SINK>] PREV:[ret(*) l1, r(doSmth(3))] <END> NEXT:[<SINK>] PREV:[ret(*) l1, r(doSmth(3))]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== doSmth == == doSmth ==
fun doSmth(i: Int) { fun doSmth(i: Int) {
@@ -967,7 +967,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/For.instructions
+4 -4
View File
@@ -29,9 +29,9 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== doSmth == == doSmth ==
fun doSmth(i: Int) {} fun doSmth(i: Int) {}
@@ -44,7 +44,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/If.instructions
+6 -6
View File
@@ -48,9 +48,9 @@ l5:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r(doSmth(r))] <END> NEXT:[<SINK>] PREV:[r(doSmth(r))]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== t2 == == t2 ==
fun t2(b: Boolean) { fun t2(b: Boolean) {
@@ -92,9 +92,9 @@ l1:
l5: l5:
<END> NEXT:[<SINK>] PREV:[ret l1, ret l1, read (Unit)] <END> NEXT:[<SINK>] PREV:[ret l1, ret l1, read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== doSmth == == doSmth ==
fun doSmth(s: String) {} fun doSmth(s: String) {}
@@ -107,7 +107,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/LazyBooleans.instructions
+2 -2
View File
@@ -72,7 +72,7 @@ l13:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r(14)] <END> NEXT:[<SINK>] PREV:[r(14)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/LocalDeclarations.instructions
+36 -36
View File
@@ -25,9 +25,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a)] <END> NEXT:[<SINK>] PREV:[w(a)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== O == == O ==
object O { object O {
@@ -45,9 +45,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w($x)] <END> NEXT:[<SINK>] PREV:[w($x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== null == == null ==
object { object {
@@ -72,9 +72,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w($x)] <END> NEXT:[<SINK>] PREV:[w($x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== doSmth == == doSmth ==
fun doSmth(i: Int) {} fun doSmth(i: Int) {}
@@ -87,9 +87,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== test1 == == test1 ==
fun test1() { fun test1() {
@@ -122,9 +122,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a)] <END> NEXT:[<SINK>] PREV:[w(a)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== test2 == == test2 ==
fun test2() { fun test2() {
@@ -152,9 +152,9 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a)] <END> NEXT:[<SINK>] PREV:[w(a)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== inner_bar == == inner_bar ==
fun inner_bar() { fun inner_bar() {
@@ -168,9 +168,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(y)] <END> NEXT:[<SINK>] PREV:[w(y)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== test3 == == test3 ==
fun test3() { fun test3() {
@@ -206,9 +206,9 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a)] <END> NEXT:[<SINK>] PREV:[w(a)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d(fun inner_bar() { y = 10 }) , <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun inner_bar() { y = 10 }) ]
l3: l3:
<START> NEXT:[r(10)] PREV:[] <START> NEXT:[r(10)] PREV:[]
r(10) NEXT:[w(y)] PREV:[<START>] r(10) NEXT:[w(y)] PREV:[<START>]
@@ -216,9 +216,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(y)] <END> NEXT:[<SINK>] PREV:[w(y)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== ggg == == ggg ==
fun ggg() { fun ggg() {
@@ -232,9 +232,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(y)] <END> NEXT:[<SINK>] PREV:[w(y)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== test4 == == test4 ==
fun test4() { fun test4() {
@@ -285,9 +285,9 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a)] <END> NEXT:[<SINK>] PREV:[w(a)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d(fun ggg() { y = 10 }) , <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 }) ]
l3: l3:
<START> NEXT:[r(10)] PREV:[] <START> NEXT:[r(10)] PREV:[]
r(10) NEXT:[w(y)] PREV:[<START>] r(10) NEXT:[w(y)] PREV:[<START>]
@@ -295,9 +295,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(y)] <END> NEXT:[<SINK>] PREV:[w(y)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
@@ -311,9 +311,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(x)] <END> NEXT:[<SINK>] PREV:[w(x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== bar == == bar ==
fun bar() { fun bar() {
@@ -327,9 +327,9 @@ l6:
l7: l7:
<END> NEXT:[<SINK>] PREV:[w(x)] <END> NEXT:[<SINK>] PREV:[w(x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== test5 == == test5 ==
fun test5() { fun test5() {
@@ -392,9 +392,9 @@ l5:
l1: l1:
<END> NEXT:[<SINK>] PREV:[w(a)] <END> NEXT:[<SINK>] PREV:[w(a)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[d(fun foo() { x = 3 }) , d(fun bar() { x = 4 }) , <END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }) , d(fun bar() { x = 4 }) ]
l3: l3:
<START> NEXT:[r(3)] PREV:[] <START> NEXT:[r(3)] PREV:[]
r(3) NEXT:[w(x)] PREV:[<START>] r(3) NEXT:[w(x)] PREV:[<START>]
@@ -402,9 +402,9 @@ l3:
l4: l4:
<END> NEXT:[<SINK>] PREV:[w(x)] <END> NEXT:[<SINK>] PREV:[w(x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
l6: l6:
<START> NEXT:[r(4)] PREV:[] <START> NEXT:[r(4)] PREV:[]
r(4) NEXT:[w(x)] PREV:[<START>] r(4) NEXT:[w(x)] PREV:[<START>]
@@ -412,9 +412,9 @@ l6:
l7: l7:
<END> NEXT:[<SINK>] PREV:[w(x)] <END> NEXT:[<SINK>] PREV:[w(x)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== foo == == foo ==
fun foo() { fun foo() {
@@ -433,7 +433,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r(doSmth(b))] <END> NEXT:[<SINK>] PREV:[r(doSmth(b))]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/OnlyWhileInFunctionBody.instructions
+4 -4
View File
@@ -25,9 +25,9 @@ l3:
l1: l1:
<END> NEXT:[<SINK>] PREV:[read (Unit)] <END> NEXT:[<SINK>] PREV:[read (Unit)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
== dowhile == == dowhile ==
fun dowhile() { fun dowhile() {
@@ -53,7 +53,7 @@ l3:
l1: l1:
<END> NEXT:[<SINK>] PREV:[ret l1] <END> NEXT:[<SINK>] PREV:[ret l1]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/ReturnFromExpression.instructions
+2 -2
View File
@@ -15,7 +15,7 @@ l2:
l1: l1:
<END> NEXT:[<SINK>] PREV:[ret(*) l1, r(false || (return false))] <END> NEXT:[<SINK>] PREV:[ret(*) l1, r(false || (return false))]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================
compiler/testData/cfg/ShortFunction.instructions
+2 -2
View File
@@ -7,7 +7,7 @@ l0:
l1: l1:
<END> NEXT:[<SINK>] PREV:[r(1)] <END> NEXT:[<SINK>] PREV:[r(1)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[<SINK>] PREV:[]
sink: sink:
<SINK> NEXT:[] PREV:[<END>] <SINK> NEXT:[] PREV:[<ERROR>, <END>]
===================== =====================