Pseudocode: Generate merge instruction regardless of number of branches
This commit is contained in:
Alexey Sedunov
@@ -11,25 +11,26 @@ L0:
|
||||
1 <START>
|
||||
2 mark({ try { // do nothing } finally { test() } })
|
||||
mark(try { // do nothing } finally { test() })
|
||||
jmp?(L2 [onExceptionToFinallyBlock]) NEXT:[mark({ test() }), mark({ // do nothing })]
|
||||
jmp?(L2 [onExceptionToFinallyBlock]) NEXT:[mark({ test() }), mark({ // do nothing })]
|
||||
3 mark({ // do nothing })
|
||||
read (Unit)
|
||||
2 jmp(L3 [skipFinallyToErrorBlock]) NEXT:[mark({ test() })]
|
||||
2 jmp(L3 [skipFinallyToErrorBlock]) NEXT:[mark({ test() })]
|
||||
L2 [onExceptionToFinallyBlock]:
|
||||
L4 [start finally]:
|
||||
3 mark({ test() }) PREV:[jmp?(L2 [onExceptionToFinallyBlock])]
|
||||
3 mark({ test() }) PREV:[jmp?(L2 [onExceptionToFinallyBlock])]
|
||||
mark(test())
|
||||
call(test(), test) -> <v0>
|
||||
L5 [finish finally]:
|
||||
2 jmp(error) NEXT:[<ERROR>]
|
||||
2 jmp(error) NEXT:[<ERROR>]
|
||||
L3 [skipFinallyToErrorBlock]:
|
||||
3 mark({ test() }) PREV:[jmp(L3 [skipFinallyToErrorBlock])]
|
||||
3 mark({ test() }) PREV:[jmp(L3 [skipFinallyToErrorBlock])]
|
||||
mark(test())
|
||||
call(test(), test) -> <v0>
|
||||
2 merge(try { // do nothing } finally { test() }|!<v1>) -> <v2>
|
||||
L1:
|
||||
1 <END> NEXT:[<SINK>]
|
||||
1 <END> NEXT:[<SINK>]
|
||||
error:
|
||||
<ERROR> PREV:[jmp(error)]
|
||||
<ERROR> PREV:[jmp(error)]
|
||||
sink:
|
||||
<SINK> PREV:[<ERROR>, <END>]
|
||||
<SINK> PREV:[<ERROR>, <END>]
|
||||
=====================
|
||||
|
||||
@@ -7,9 +7,9 @@ tailRecursive fun test() : Int {
|
||||
}
|
||||
}
|
||||
---------------------
|
||||
{ // do nothing } !<v1>: *
|
||||
test() <v0>: * NEW: call(test(), test) -> <v0>
|
||||
{ test() } <v0>: * COPY
|
||||
try { // do nothing } finally { test() } !<v1>: * COPY
|
||||
{ try { // do nothing } finally { test() } } !<v1>: * COPY
|
||||
{ // do nothing } !<v1>: *
|
||||
test() <v0>: * NEW: call(test(), test) -> <v0>
|
||||
{ test() } <v0>: * COPY
|
||||
try { // do nothing } finally { test() } <v2>: * NEW: merge(try { // do nothing } finally { test() }|!<v1>) -> <v2>
|
||||
{ try { // do nothing } finally { test() } } <v2>: * COPY
|
||||
=====================
|
||||
|
||||
@@ -11,27 +11,28 @@ L0:
|
||||
1 <START>
|
||||
2 mark({ try { // do nothing } finally { return test() } })
|
||||
mark(try { // do nothing } finally { return test() })
|
||||
jmp?(L2 [onExceptionToFinallyBlock]) NEXT:[mark({ return test() }), mark({ // do nothing })]
|
||||
jmp?(L2 [onExceptionToFinallyBlock]) NEXT:[mark({ return test() }), mark({ // do nothing })]
|
||||
3 mark({ // do nothing })
|
||||
read (Unit)
|
||||
2 jmp(L3 [skipFinallyToErrorBlock]) NEXT:[mark({ return test() })]
|
||||
2 jmp(L3 [skipFinallyToErrorBlock]) NEXT:[mark({ return test() })]
|
||||
L2 [onExceptionToFinallyBlock]:
|
||||
L4 [start finally]:
|
||||
3 mark({ return test() }) PREV:[jmp?(L2 [onExceptionToFinallyBlock])]
|
||||
3 mark({ return test() }) PREV:[jmp?(L2 [onExceptionToFinallyBlock])]
|
||||
mark(test())
|
||||
call(test(), test) -> <v0>
|
||||
ret(*|<v0>) L1 NEXT:[<END>]
|
||||
ret(*|<v0>) L1 NEXT:[<END>]
|
||||
L5 [finish finally]:
|
||||
- 2 jmp(error) NEXT:[<ERROR>] PREV:[]
|
||||
- 2 jmp(error) NEXT:[<ERROR>] PREV:[]
|
||||
L3 [skipFinallyToErrorBlock]:
|
||||
3 mark({ return test() }) PREV:[jmp(L3 [skipFinallyToErrorBlock])]
|
||||
3 mark({ return test() }) PREV:[jmp(L3 [skipFinallyToErrorBlock])]
|
||||
mark(test())
|
||||
call(test(), test) -> <v0>
|
||||
ret(*|<v0>) L1
|
||||
ret(*|<v0>) L1 NEXT:[<END>]
|
||||
- 2 merge(try { // do nothing } finally { return test() }|!<v2>) -> <v3> PREV:[]
|
||||
L1:
|
||||
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v0>) L1, ret(*|<v0>) L1]
|
||||
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v0>) L1, ret(*|<v0>) L1]
|
||||
error:
|
||||
<ERROR> PREV:[]
|
||||
<ERROR> PREV:[]
|
||||
sink:
|
||||
<SINK> PREV:[<ERROR>, <END>]
|
||||
<SINK> PREV:[<ERROR>, <END>]
|
||||
=====================
|
||||
|
||||
@@ -7,10 +7,10 @@ tailRecursive fun test() : Int {
|
||||
}
|
||||
}
|
||||
---------------------
|
||||
{ // do nothing } !<v2>: *
|
||||
test() <v0>: Int NEW: call(test(), test) -> <v0>
|
||||
return test() !<v1>: *
|
||||
{ return test() } !<v1>: * COPY
|
||||
try { // do nothing } finally { return test() } !<v2>: * COPY
|
||||
{ try { // do nothing } finally { return test() } } !<v2>: * COPY
|
||||
{ // do nothing } !<v2>: *
|
||||
test() <v0>: Int NEW: call(test(), test) -> <v0>
|
||||
return test() !<v1>: *
|
||||
{ return test() } !<v1>: * COPY
|
||||
try { // do nothing } finally { return test() } <v3>: * NEW: merge(try { // do nothing } finally { return test() }|!<v2>) -> <v3>
|
||||
{ try { // do nothing } finally { return test() } } <v3>: * COPY
|
||||
=====================
|
||||
|
||||
@@ -24,23 +24,24 @@ L0:
|
||||
jf(L2|<v5>) NEXT:[read (Unit), r(sum) -> <v6>]
|
||||
r(sum) -> <v6>
|
||||
ret(*|<v6>) L1 NEXT:[<END>]
|
||||
- jmp(L3) NEXT:[r(x) -> <v8>] PREV:[]
|
||||
- jmp(L3) NEXT:[merge(if (x == 0.toLong()) return sum|!<v7>) -> <v8>] PREV:[]
|
||||
L2:
|
||||
read (Unit) PREV:[jf(L2|<v5>)]
|
||||
L3:
|
||||
r(x) -> <v8>
|
||||
r(1) -> <v9>
|
||||
merge(if (x == 0.toLong()) return sum|!<v7>) -> <v8>
|
||||
r(x) -> <v9>
|
||||
r(1) -> <v10>
|
||||
mark(x - 1)
|
||||
call(x - 1, minus|<v8>, <v9>) -> <v10>
|
||||
r(sum) -> <v11>
|
||||
r(x) -> <v12>
|
||||
call(x - 1, minus|<v9>, <v10>) -> <v11>
|
||||
r(sum) -> <v12>
|
||||
r(x) -> <v13>
|
||||
mark(sum + x)
|
||||
call(sum + x, plus|<v11>, <v12>) -> <v13>
|
||||
call(sum + x, plus|<v12>, <v13>) -> <v14>
|
||||
mark(sum(x - 1, sum + x))
|
||||
call(sum(x - 1, sum + x), sum|<v10>, <v13>) -> <v14>
|
||||
ret(*|<v14>) L1
|
||||
call(sum(x - 1, sum + x), sum|<v11>, <v14>) -> <v15>
|
||||
ret(*|<v15>) L1
|
||||
L1:
|
||||
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v6>) L1, ret(*|<v14>) L1]
|
||||
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v6>) L1, ret(*|<v15>) L1]
|
||||
error:
|
||||
<ERROR> PREV:[]
|
||||
sink:
|
||||
|
||||
@@ -13,14 +13,14 @@ toLong() <v4>: *
|
||||
x == 0.toLong() <v5>: Boolean NEW: call(x == 0.toLong(), equals|<v2>, <v4>) -> <v5>
|
||||
sum <v6>: Long NEW: r(sum) -> <v6>
|
||||
return sum !<v7>: *
|
||||
if (x == 0.toLong()) return sum !<v7>: * COPY
|
||||
x <v8>: Long NEW: r(x) -> <v8>
|
||||
1 <v9>: Int NEW: r(1) -> <v9>
|
||||
x - 1 <v10>: Long NEW: call(x - 1, minus|<v8>, <v9>) -> <v10>
|
||||
sum <v11>: Long NEW: r(sum) -> <v11>
|
||||
x <v12>: Long NEW: r(x) -> <v12>
|
||||
sum + x <v13>: Long NEW: call(sum + x, plus|<v11>, <v12>) -> <v13>
|
||||
sum(x - 1, sum + x) <v14>: Long NEW: call(sum(x - 1, sum + x), sum|<v10>, <v13>) -> <v14>
|
||||
return sum(x - 1, sum + x) !<v15>: *
|
||||
{ if (x == 0.toLong()) return sum return sum(x - 1, sum + x) } !<v15>: * COPY
|
||||
if (x == 0.toLong()) return sum <v8>: * NEW: merge(if (x == 0.toLong()) return sum|!<v7>) -> <v8>
|
||||
x <v9>: Long NEW: r(x) -> <v9>
|
||||
1 <v10>: Int NEW: r(1) -> <v10>
|
||||
x - 1 <v11>: Long NEW: call(x - 1, minus|<v9>, <v10>) -> <v11>
|
||||
sum <v12>: Long NEW: r(sum) -> <v12>
|
||||
x <v13>: Long NEW: r(x) -> <v13>
|
||||
sum + x <v14>: Long NEW: call(sum + x, plus|<v12>, <v13>) -> <v14>
|
||||
sum(x - 1, sum + x) <v15>: Long NEW: call(sum(x - 1, sum + x), sum|<v11>, <v14>) -> <v15>
|
||||
return sum(x - 1, sum + x) !<v16>: *
|
||||
{ if (x == 0.toLong()) return sum return sum(x - 1, sum + x) } !<v16>: * COPY
|
||||
=====================
|
||||
|
||||
Reference in New Issue
Block a user