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

Pseudocode: Do not bind call value to callee expressions

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-10 17:25:16 +04:00
parent e94f96d457
commit 168b32920b
52 changed files with 351 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg-variables/basic/IfWithUninitialized.values
+3 -5
View File
@@ -10,12 +10,10 @@ fun foo() {
}
---------------------
1 <v0> NEW()
< <v2> NEW(<v0>, <v1>)
2 <v1> NEW()
1 < 2 <v2> COPY
use <v4> NEW(<v3>)
2 <v1> NEW()
1 < 2 <v2> NEW(<v0>, <v1>)
b <v3> NEW()
use(b) <v4> COPY
use(b) <v4> NEW(<v3>)
{ use(b) } <v4> COPY
true <v5> NEW()
if (1 < 2) { use(b) } else { b = true } <v4> COPY
compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values
+3 -5
View File
@@ -17,12 +17,10 @@ fun foo() {
}
---------------------
x <v1> NEW()
+ <v3> NEW(<v1>, <v2>)
a <v2> NEW()
x + a <v3> COPY
use <v5> NEW(<v4>)
a <v2> NEW()
x + a <v3> NEW(<v1>, <v2>)
a <v4> NEW()
use(a) <v5> COPY
use(a) <v5> NEW(<v4>)
val y = x + a use(a) <v5> COPY
=====================
== use ==
compiler/testData/cfg-variables/basic/VariablesUsage.values
+4 -6
View File
@@ -7,13 +7,11 @@ fun foo() {
}
---------------------
1 <v0> NEW()
use <v2> NEW(<v1>)
a <v1> NEW()
use(a) <v2> COPY
a <v1> NEW()
use(a) <v2> NEW(<v1>)
2 <v3> NEW()
use <v5> NEW(<v4>)
a <v4> NEW()
use(a) <v5> COPY
a <v4> NEW()
use(a) <v5> NEW(<v4>)
{ var a = 1 use(a) a = 2 use(a) } <v5> COPY
=====================
== bar ==
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.values
+8 -11
View File
@@ -12,16 +12,14 @@ class TestFunctionLiteral {
sum(x - 1) + x
}
---------------------
sum <v5> NEW(<v1>, <v4>)
sum <v1> NEW()
x <v2> NEW()
- <v4> NEW(<v2>, <v3>)
1 <v3> NEW()
x - 1 <v4> COPY
sum(x - 1) <v5> COPY
+ <v7> NEW(<v5>, <v6>)
1 <v3> NEW()
x - 1 <v4> NEW(<v2>, <v3>)
sum(x - 1) <v5> NEW(<v1>, <v4>)
x <v6> NEW()
sum(x - 1) + x <v7> COPY
sum(x - 1) + x <v7> COPY
sum(x - 1) + x <v7> NEW(<v5>, <v6>)
sum(x - 1) + x <v7> COPY
=====================
== A ==
open class A(val a: A)
@@ -56,7 +54,6 @@ class TestOther {
}
---------------------
x <v0> NEW()
+ <v2> NEW(<v0>, <v1>)
1 <v1> NEW()
x + 1 <v2> COPY
1 <v1> NEW()
x + 1 <v2> NEW(<v0>, <v1>)
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIf.instructions
+1 -1
View File
@@ -33,7 +33,7 @@ L3:
error(use, No resolved call) USE: in: {b=READ} out: {b=READ}
r(b) -> <v5> USE: in: {} out: {b=READ}
error(use, No resolved call)
magic(use|<v5>) -> <v6>
magic(use(b)|<v5>) -> <v6>
L1:
1 <END> INIT: in: {} out: {}
error:
compiler/testData/cfg-variables/bugs/varInitializationInIf.values
+7 -9
View File
@@ -10,14 +10,12 @@ fun foo() {
use(b)
}
---------------------
1 <v0> NEW()
< <v2> NEW(<v0>, <v1>)
2 <v1> NEW()
1 < 2 <v2> COPY
false <v3> NEW()
true <v4> NEW()
use <v6> NEW(<v5>)
b <v5> NEW()
use(b) <v6> COPY
1 <v0> NEW()
2 <v1> NEW()
1 < 2 <v2> NEW(<v0>, <v1>)
false <v3> NEW()
true <v4> NEW()
b <v5> NEW()
use(b) <v6> NEW(<v5>)
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6> COPY
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values
+2 -4
View File
@@ -15,14 +15,12 @@ fun foo(numbers: Collection<Int>) {
---------------------
numbers <v1> NEW()
1 <v3> NEW()
< <v5> NEW(<v3>, <v4>)
2 <v4> NEW()
1 < 2 <v5> COPY
1 < 2 <v5> NEW(<v3>, <v4>)
false <v6> NEW()
true <v7> NEW()
use <v9> NEW(<v8>)
b <v8> NEW()
use(b) <v9> COPY
use(b) <v9> NEW(<v8>)
=====================
== use ==
fun use(vararg a: Any?) = a
compiler/testData/cfg-variables/lexicalScopes/doWhileScope.values
+2 -3
View File
@@ -10,9 +10,8 @@ fun foo() {
"before" <v0> NEW()
2 <v1> NEW()
a <v2> NEW()
> <v4> NEW(<v2>, <v3>)
0 <v3> NEW()
a > 0 <v4> COPY
0 <v3> NEW()
a > 0 <v4> NEW(<v2>, <v3>)
"after" <v5> NEW()
{ "before" do { var a = 2 } while (a > 0) "after" } <v5> COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/forScope.values
+2 -3
View File
@@ -9,9 +9,8 @@ fun foo() {
---------------------
"before" <v0> NEW()
1 <v1> NEW()
.. <v3> NEW(<v1>, <v2>)
10 <v2> NEW()
1..10 <v3> COPY
10 <v2> NEW()
1..10 <v3> NEW(<v1>, <v2>)
i <v5> NEW()
"after" <v6> NEW()
{ "before" for (i in 1..10) { val a = i } "after" } <v6> COPY
compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values
+1 -2
View File
@@ -20,7 +20,6 @@ fun foo() {
}
---------------------
x <v1> NEW()
+ <v3> NEW(<v1>, <v2>)
b <v2> NEW()
x + b <v3> COPY
x + b <v3> NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.values
+1 -2
View File
@@ -19,7 +19,6 @@ fun local(x: Int) {
}
---------------------
x <v1> NEW()
+ <v3> NEW(<v1>, <v2>)
b <v2> NEW()
x + b <v3> COPY
x + b <v3> NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.values
+1 -2
View File
@@ -15,7 +15,6 @@ fun foo() {
fun local(x: Int) = x + b
---------------------
x <v1> NEW()
+ <v3> NEW(<v1>, <v2>)
b <v2> NEW()
x + b <v3> COPY
x + b <v3> NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/lexicalScopes/tryScope.values
+2 -3
View File
@@ -14,9 +14,8 @@ fun foo() {
}
---------------------
"before" <v0> NEW()
foo <v1> NEW()
foo() <v1> COPY
{ foo() } <v1> COPY
foo() <v1> NEW()
{ foo() } <v1> COPY
e <v3> NEW()
1 <v4> NEW()
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1> COPY